From: Paul Mackerras Date: Thu, 2 Jan 2014 04:29:15 +0000 (+1100) Subject: config: Update Solaris compiler options and enable CHAPMS and IPV6 X-Git-Tag: ppp-2.4.7~12 X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=99c46caaed01b7edba87962aa52b77fad61bfd7b config: Update Solaris compiler options and enable CHAPMS and IPV6 As suggested by James Carlson. Signed-off-by: Paul Mackerras --- diff --git a/configure b/configure index 56816b8..6a55e0f 100755 --- a/configure +++ b/configure @@ -44,7 +44,7 @@ case $system in /opt/SUNWspro/bin/cc -flags >/dev/null 2>&1; then if [ "$archvariant" = "-64x" ]; then ( cd /tmp; echo "int x;" > ppp$$.c - /opt/SUNWspro/bin/cc -c -errwarn -xchip=opteron -xarch=amd64 ppp$$.c >/dev/null 2>&1 || ( + /opt/SUNWspro/bin/cc -c -errwarn -xchip=opteron -m64 ppp$$.c >/dev/null 2>&1 || ( echo "WorkShop C is unable to make 64 bit modules, and your $karch system needs" echo "them. Consider upgrading cc on this machine." rm -f ppp$$.c diff --git a/pppd/Makefile.sol2 b/pppd/Makefile.sol2 index 1ad4b13..45b6b62 100644 --- a/pppd/Makefile.sol2 +++ b/pppd/Makefile.sol2 @@ -32,12 +32,12 @@ LIBS += -ldl # # Solaris 8 and on includes support for IPv6 # -#CFLAGS += -DINET6 -#OBJS += ipv6cp.o eui64.o +CFLAGS += -DINET6 +OBJS += ipv6cp.o eui64.o # Uncomment to enable MS-CHAP -#CFLAGS += -DUSE_CRYPT -DCHAPMS -DMSLANMAN -DHAVE_CRYPT_H -#OBJS += chap_ms.o pppcrypt.o md4.o sha1.o +CFLAGS += -DUSE_CRYPT -DCHAPMS -DMSLANMAN -DHAVE_CRYPT_H +OBJS += chap_ms.o pppcrypt.o md4.o sha1.o # Uncomment for CBCP #CFLAGS += -DCBCP_SUPPORT diff --git a/solaris/Makefile.sol2-64x b/solaris/Makefile.sol2-64x index 83f59ad..afddcb9 100644 --- a/solaris/Makefile.sol2-64x +++ b/solaris/Makefile.sol2-64x @@ -7,7 +7,7 @@ include Makedefs.sol2 # Sun's cc flag for LP64 compilation / linkage -COPTS += -errwarn -xtarget=opteron -xarch=amd64 -xmodel=kernel \ +COPTS += -errwarn -xtarget=opteron -m64 -xmodel=kernel \ -Ui386 -U__i386 -D__amd64 -xO2 # subdirectory where 64-bit objects / binaries will be placed