diff options
| -rw-r--r-- | maintainers/docs/todo.txt | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/darwin-makefile.patch | 37 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 1 |
3 files changed, 38 insertions, 7 deletions
diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt index 69727c4a5466..463d40decb80 100644 --- a/maintainers/docs/todo.txt +++ b/maintainers/docs/todo.txt @@ -12,10 +12,3 @@ * Add gettext to glib propagatedBuildInputs? Glib's `gi18n.h' doesn't seem to like Glibc `libintl.h'; needs the gettext one instead. [Move from libbonoboui] - -* In libxml2: python2.3 -> python2.4 (or even better, make this - generic; also in bittorrent). - -* Packages that need ncurses almost always need special flags. They - expect "ncurses.h" rather than "ncurses/ncurses.h" to be in the - include path. Fix this. diff --git a/pkgs/development/libraries/openssl/darwin-makefile.patch b/pkgs/development/libraries/openssl/darwin-makefile.patch new file mode 100644 index 000000000000..492dd89475d8 --- /dev/null +++ b/pkgs/development/libraries/openssl/darwin-makefile.patch @@ -0,0 +1,37 @@ +diff -rc openssl-0.9.7h-orig/Makefile.org openssl-0.9.7h/Makefile.org +*** openssl-0.9.7h-orig/Makefile.org 2005-06-20 06:29:54.000000000 +0200 +--- openssl-0.9.7h/Makefile.org 2005-10-12 09:38:00.000000000 +0200 +*************** +*** 258,264 **** + libcrypto$(SHLIB_EXT): libcrypto.a + @if [ "$(SHLIB_TARGET)" != "" ]; then \ + $(MAKE) SHLIBDIRS=crypto build-shared; \ +! if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ + fips/sha/fips_standalone_sha1 -binary $@ > $@.$${HMAC_EXT:-sha1}; \ + fi; \ + else \ +--- 258,264 ---- + libcrypto$(SHLIB_EXT): libcrypto.a + @if [ "$(SHLIB_TARGET)" != "" ]; then \ + $(MAKE) SHLIBDIRS=crypto build-shared; \ +! if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ + fips/sha/fips_standalone_sha1 -binary $@ > $@.$${HMAC_EXT:-sha1}; \ + fi; \ + else \ +*************** +*** 325,331 **** + if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \ + libs="$(LIBKRB5) $$libs"; \ + fi; \ +! ( set -x; ${CC} ${SHARED_LDFLAGS} + --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \ + lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \ + -compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \ +--- 325,331 ---- + if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \ + libs="$(LIBKRB5) $$libs"; \ + fi; \ +! ( set -x; ${CC} ${SHARED_LDFLAGS} \ + --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \ + lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \ + -compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \ diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index f2a218914268..5012ec5b9689 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,4 +6,5 @@ sha1 = "9fe535fce89af967b29c4727dedd25f2b4cc2f0d"; }; buildInputs = [perl]; + patches = [./darwin-makefile.patch]; } |