2012-01-04 15:10:27 +00:00
|
|
|
diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
|
2021-07-20 20:21:36 +01:00
|
|
|
index 22837c5..6f6fff5 100644
|
2012-01-04 15:10:27 +00:00
|
|
|
--- a/pppd/Makefile.linux
|
|
|
|
|
+++ b/pppd/Makefile.linux
|
2021-07-20 20:21:36 +01:00
|
|
|
@@ -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
|
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b5 ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07df. 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.
2022-03-25 15:33:21 +00:00
|
|
|
+LIBS += -lsrp -L@openssl_lib@/lib
|
2021-07-20 20:21:36 +01:00
|
|
|
NEEDCRYPTOLIB = y
|
|
|
|
|
TARGETS += srp-entry
|
|
|
|
|
EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
|
|
|
|
|
@@ -143,7 +143,7 @@ CFLAGS += -DHAS_SHADOW
|
2012-01-04 15:10:27 +00:00
|
|
|
#LIBS += -lshadow $(LIBS)
|
|
|
|
|
endif
|
|
|
|
|
|
2021-07-20 20:21:36 +01:00
|
|
|
-ifeq ($(shell echo '\#include <crypt.h>' | $(CC) -E - >/dev/null 2>&1 && echo yes),yes)
|
2012-01-04 15:10:27 +00:00
|
|
|
+ifneq ($(wildcard @glibc@/include/crypt.h),)
|
|
|
|
|
CFLAGS += -DHAVE_CRYPT_H=1
|
2021-07-20 20:21:36 +01:00
|
|
|
LIBS += -lcrypt
|
2012-01-04 15:10:27 +00:00
|
|
|
endif
|
2021-07-20 20:21:36 +01:00
|
|
|
@@ -155,7 +155,7 @@ endif
|
2020-01-08 08:03:22 +00:00
|
|
|
|
|
|
|
|
ifdef NEEDDES
|
|
|
|
|
ifndef USE_CRYPT
|
2020-03-06 22:33:06 +00:00
|
|
|
-CFLAGS += -I$(shell $(CC) --print-sysroot)/usr/include/openssl
|
2021-07-20 20:21:36 +01:00
|
|
|
+CFLAGS += -I@openssl_dev@/include/openssl
|
|
|
|
|
NEEDCRYPTOLIB = y
|
2020-01-08 08:03:22 +00:00
|
|
|
else
|
|
|
|
|
CFLAGS += -DUSE_CRYPT=1
|
