diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-06 23:08:30 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-06 23:08:30 +0000 |
commit | 3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f (patch) | |
tree | 201cfcc1d18cbbb75bb90d244c7073b9a5899503 /pkgs/development/libraries/openssl/gnu.patch | |
parent | 26ea77ad65d009fa6715934860ec769ee10a56b1 (diff) | |
parent | 1401241864c48ebab0f3b8c2df446e0c3ba4a720 (diff) | |
download | nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.gz nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.bz2 nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.lz nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.xz nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.tar.zst nixlib-3ce77ab9c408e1b348f6d56c2a8af2f0e76df74f.zip |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31386
Diffstat (limited to 'pkgs/development/libraries/openssl/gnu.patch')
-rw-r--r-- | pkgs/development/libraries/openssl/gnu.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/development/libraries/openssl/gnu.patch b/pkgs/development/libraries/openssl/gnu.patch new file mode 100644 index 000000000000..3cc6d049c944 --- /dev/null +++ b/pkgs/development/libraries/openssl/gnu.patch @@ -0,0 +1,25 @@ +Patch to fix compilation on GNU/Hurd and GNU/kFreeBSD. + +--- openssl-1.0.0e/Configure 2012-01-06 00:39:49.000000000 +0100 ++++ openssl-1.0.0e/Configure 2012-01-06 00:39:51.000000000 +0100 +@@ -563,7 +563,7 @@ my %table=( + "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::", + + ##### GNU Hurd +-"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC", ++"hurd-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + + ##### OS/2 EMX + "OS2-EMX", "gcc::::::::", + +--- openssl-1.0.0e/crypto/dso/dso_dlfcn.c 2012-01-06 00:05:47.000000000 +0100 ++++ openssl-1.0.0e/crypto/dso/dso_dlfcn.c 2012-01-06 00:21:05.000000000 +0100 +@@ -60,7 +60,7 @@ + that handle _GNU_SOURCE and other similar macros. Defining it later + is simply too late, because those headers are protected from re- + inclusion. */ +-#ifdef __linux ++#if defined __linux || defined __GNU__ || defined __GLIBC__ + # ifndef _GNU_SOURCE + # define _GNU_SOURCE /* make sure dladdr is declared */ + # endif |