bind: drop a darwin-specific patch (#62882)
The patch didn't apply since 9.12 -> 9.14 (26026c3e1a). I'll hope it's not needed anymore (and let Borg verify that). It was reportedly just a configure-time error: e4602677.
This commit is contained in:
parent
4d2bd93da8
commit
c5c366156c
@ -1,26 +0,0 @@
|
|||||||
diff --git a/configure b/configure
|
|
||||||
index b9ad66b..a2a7382 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -16033,21 +16033,6 @@ $as_echo "not found" >&6; }
|
|
||||||
*-hp-hpux*)
|
|
||||||
DST_OPENSSL_LIBS="-L$use_openssl/lib -Wl,+b: -lcrypto"
|
|
||||||
;;
|
|
||||||
- *-apple-darwin*)
|
|
||||||
- #
|
|
||||||
- # Apple's ld seaches for serially for dynamic
|
|
||||||
- # then static libraries. This means you can't
|
|
||||||
- # use -L to override dynamic system libraries
|
|
||||||
- # with static ones when linking. Instead
|
|
||||||
- # we specify a absolute path.
|
|
||||||
- #
|
|
||||||
- if test -f "$use_openssl/lib/libcrypto.dylib"
|
|
||||||
- then
|
|
||||||
- DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
|
|
||||||
- else
|
|
||||||
- DST_OPENSSL_LIBS="$use_openssl/lib/libcrypto.a"
|
|
||||||
- fi
|
|
||||||
- ;;
|
|
||||||
*)
|
|
||||||
DST_OPENSSL_LIBS="-L$use_openssl/lib -lcrypto"
|
|
||||||
;;
|
|
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
|||||||
patches = [
|
patches = [
|
||||||
./dont-keep-configure-flags.patch
|
./dont-keep-configure-flags.patch
|
||||||
./remove-mkdir-var.patch
|
./remove-mkdir-var.patch
|
||||||
] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ perl ];
|
nativeBuildInputs = [ perl ];
|
||||||
buildInputs = [ libtool libxml2 openssl ]
|
buildInputs = [ libtool libxml2 openssl ]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user