tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

SSLBASE vs. PREFER_PKGSRC=openssl



A lot of packages use SSLBASE/BUILDLINK_PREFIX.openssl variables in
order to find openssl base directory. These variables are not set
correctly if PREFER_PKGSRC=openssl.
 0 alpine>make show-vars VARNAMES='SSLBASE SSLCERTS'
 /usr
 /etc/openssl/certs
 0 alpine>make show-vars VARNAMES='SSLBASE SSLCERTS' PREFER_PKGSRC=openssl
 /usr/pkg/etc/openssl/certs
 0 alpine>
The following patch (-U12) solves the problem. Do you mind if commit it?
Index: security/openssl/builtin.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/openssl/builtin.mk,v
retrieving revision 1.31
diff -u -U 12 -r1.31 builtin.mk
--- security/openssl/builtin.mk 17 Nov 2011 13:03:19 -0000 1.31
+++ security/openssl/builtin.mk 9 Feb 2012 22:47:06 -0000
@@ -161,24 +161,26 @@
 
 . if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 . if empty(H_OPENSSLV:M__nonexistent__)
 . if !empty(H_OPENSSLV:M/usr/sfw/*)
 BUILDLINK_PREFIX.openssl= /usr/sfw
 BUILDLINK_PASSTHRU_DIRS+= /usr/sfw
 . elif !empty(H_OPENSSLV:M/usr/*)
 BUILDLINK_PREFIX.openssl= /usr
 . elif !empty(H_OPENSSLV:M/boot/common/*)
 BUILDLINK_PREFIX.openssl= /boot/common
 . endif
 . endif
+. else
+BUILDLINK_PREFIX.openssl= ${PREFIX}
 . endif
 
 # By default, we don't bother with the old DES API.
 USE_OLD_DES_API?= no
 . if !empty(USE_OLD_DES_API:M[yY][eE][sS])
 #
 # If we're using the old DES API, then check to see if the old DES
 # code was factored out into a separate library and header files and
 # no longer a part of libcrypto.
 #
 . if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
 . if exists(${BUILDLINK_PREFIX.openssl}/include/des.h) && \
-- 
Best regards, Aleksey Cheusov.


Home | Main Index | Thread Index | Old Index

AltStyle によって変換されたページ (->オリジナル) /