diff options
author | dinoex <dinoex@FreeBSD.org> | 2003-04-04 02:24:52 +0800 |
---|---|---|
committer | dinoex <dinoex@FreeBSD.org> | 2003-04-04 02:24:52 +0800 |
commit | 5457be2895d06e8a24cae8c2f0643644a6a44ade (patch) | |
tree | cc1308c09ab59ab31574286c965f9e1b6cb8923d | |
parent | e55c81b340c0a0bb10ff6a70805817c33665a017 (diff) | |
download | freebsd-ports-gnome-5457be2895d06e8a24cae8c2f0643644a6a44ade.tar.gz freebsd-ports-gnome-5457be2895d06e8a24cae8c2f0643644a6a44ade.tar.zst freebsd-ports-gnome-5457be2895d06e8a24cae8c2f0643644a6a44ade.zip |
- honor CC and use PTHREAD_LIBS and PTHREAD_FLAGS
marius@alchemy.franken.de
-rw-r--r-- | security/openssl/Makefile | 1 | ||||
-rw-r--r-- | security/openssl/files/patch-Configure | 6 | ||||
-rw-r--r-- | security/openssl/files/patch-config | 20 |
3 files changed, 24 insertions, 3 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 270e2f386bc1..febd8509f07e 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -866,6 +866,7 @@ EXTRACONFIGURE= 386 do-configure: cd ${WRKSRC} \ && ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" PERL="${PERL}" \ + PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS} \ ./config --prefix=${PREFIX} --openssldir=${OPENSSLDIR} \ -L${PREFIX}/lib ${EXTRACONFIGURE} diff --git a/security/openssl/files/patch-Configure b/security/openssl/files/patch-Configure index 6c5cdbf36e16..177fff35cbba 100644 --- a/security/openssl/files/patch-Configure +++ b/security/openssl/files/patch-Configure @@ -5,7 +5,7 @@ # This probably belongs in a different section. # -"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", #### Alpha Linux with GNU C and Compaq C setups # Special notes: @@ -17,8 +17,8 @@ -"FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", -+"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"FreeBSD-sparc64","$ENV{CC}:-DB_ENDIAN -DTERMIOS $ENV{CFLAGS}::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -Wall::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"FreeBSD-sparc64","$ENV{CC}:-DB_ENDIAN -DTERMIOS $ENV{CFLAGS}::$ENV{PTHREAD_LIBS} -D_REENTRANT $ENV{PTHREAD_CFLAGS}:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"FreeBSD-ia64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown):::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}", diff --git a/security/openssl/files/patch-config b/security/openssl/files/patch-config new file mode 100644 index 000000000000..5c7290eefd9a --- /dev/null +++ b/security/openssl/files/patch-config @@ -0,0 +1,20 @@ +--- config.orig Wed Mar 26 22:09:15 2003 ++++ config Wed Mar 26 21:37:27 2003 +@@ -392,7 +392,7 @@ + # we fallback to whatever cc does on the system + GCCVER=`(gcc -dumpversion) 2>/dev/null` + if [ "$GCCVER" != "" ]; then +- CC=gcc ++ CC=${CC:-gcc} + # then strip off whatever prefix egcs prepends the number with... + # Hopefully, this will work for any future prefixes as well. + GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'` +@@ -402,7 +402,7 @@ + # peak single digit before and after first dot, e.g. 2.95.1 gives 29 + GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'` + else +- CC=cc ++ CC=${CC:-cc} + fi + GCCVER=${GCCVER:-0} + if [ "$SYSTEM" = "HP-UX" ];then |