forked from mirrors/nixpkgs
fd78240ac8
At some point, I'd like to make another attempt at71f1f4884b("openssl: stop static binaries referencing libs"), which was reverted in195c7da07d. One problem with my previous attempt is that I moved OpenSSL's libraries to a lib output, but many dependent packages were hardcoding the out output as the location of the libraries. This patch fixes every such case I could find in the tree. It won't have any effect immediately, but will mean these packages will automatically use an OpenSSL lib output if it is reintroduced in future. This patch should cause very few rebuilds, because it shouldn't make any change at all to most packages I'm touching. The few rebuilds that are introduced come from when I've changed a package builder not to use variable names like openssl.out in scripts / substitution patterns, which would be confusing since they don't hardcode the output any more. I started by making the following global replacements: ${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib ${openssl.out}/lib -> ${lib.getLib openssl}/lib Then I removed the ".out" suffix when part of the argument to lib.makeLibraryPath, since that function uses lib.getLib internally. Then I fixed up cases where openssl was part of the -L flag to the compiler/linker, since that unambigously is referring to libraries. Then I manually investigated and fixed the following packages: - pycurl - citrix-workspace - ppp - wraith - unbound - gambit - acl2 I'm reasonably confindent in my fixes for all of them. For acl2, since the openssl library paths are manually provided above anyway, I don't think openssl is required separately as a build input at all. Removing it doesn't make a difference to the output size, the file list, or the closure. I've tested evaluation with the OfBorg meta checks, to protect against introducing evaluation failures.
34 lines
991 B
Diff
34 lines
991 B
Diff
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
|
index 22837c5..6f6fff5 100644
|
|
--- a/pppd/Makefile.linux
|
|
+++ b/pppd/Makefile.linux
|
|
@@ -111,8 +111,8 @@ endif
|
|
|
|
# EAP SRP-SHA1
|
|
ifdef USE_SRP
|
|
-CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
|
|
-LIBS += -lsrp -L/usr/local/ssl/lib
|
|
+CFLAGS += -DUSE_SRP -DOPENSSL -I@openssl_dev@/include/openssl
|
|
+LIBS += -lsrp -L@openssl_lib@/lib
|
|
NEEDCRYPTOLIB = y
|
|
TARGETS += srp-entry
|
|
EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
|
|
@@ -143,7 +143,7 @@ CFLAGS += -DHAS_SHADOW
|
|
#LIBS += -lshadow $(LIBS)
|
|
endif
|
|
|
|
-ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes)
|
|
+ifneq ($(wildcard @glibc@/include/crypt.h),)
|
|
CFLAGS += -DHAVE_CRYPT_H=1
|
|
LIBS += -lcrypt
|
|
endif
|
|
@@ -155,7 +155,7 @@ endif
|
|
|
|
ifdef NEEDDES
|
|
ifndef USE_CRYPT
|
|
-CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl
|
|
+CFLAGS += -I@openssl_dev@/include/openssl
|
|
NEEDCRYPTOLIB = y
|
|
else
|
|
CFLAGS += -DUSE_CRYPT=1
|