pkgsrc-WIP-changes archive

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

Import security/crypto++



Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Thu Feb 6 16:29:11 2025 +0100
Changeset:	683bbd2e14f3f740cb3722a6ba44c7af25df98de

Modified Files:
	Makefile
Added Files:
	crypto++/DESCR
	crypto++/Makefile
	crypto++/PLIST
	crypto++/buildlink3.mk
	crypto++/distinfo
	crypto++/patches/patch-GNUmakefile

Log Message:
Import security/crypto++

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=683bbd2e14f3f740cb3722a6ba44c7af25df98de

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                           |   1 +
 crypto++/DESCR                     |   5 +
 crypto++/Makefile                  |  23 +++
 crypto++/PLIST                     | 351 +++++++++++++++++++++++++++++++++++++
 crypto++/buildlink3.mk             |  13 ++
 crypto++/distinfo                  |   6 +
 crypto++/patches/patch-GNUmakefile |  90 ++++++++++
 7 files changed, 489 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 4191cbee80..38d8417cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -607,6 +607,7 @@ SUBDIR+=	crosswrench-git
 SUBDIR+=	crrcsim
 SUBDIR+=	crust-firmware
 SUBDIR+=	cryptcat
+SUBDIR+=	crypto++
 SUBDIR+=	crystal
 SUBDIR+=	crystal-bin
 SUBDIR+=	cskk
diff --git a/crypto++/DESCR b/crypto++/DESCR
new file mode 100644
index 0000000000..7f3931e56f
--- /dev/null
+++ b/crypto++/DESCR
@@ -0,0 +1,5 @@
+Crypto++ Library is a free C++ class library of cryptographic schemes.
+One purpose of Crypto++ is to act as a repository of public domain
+(not copyrighted) source code.  Although the library is copyrighted as
+a compilation, the individual files in it (except for a few exceptions
+listed in the license) are in the public domain.
diff --git a/crypto++/Makefile b/crypto++/Makefile
new file mode 100644
index 0000000000..fbf0de7c66
--- /dev/null
+++ b/crypto++/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.25 2022/10/02 16:20:26 nros Exp $
+
+DISTNAME=	cryptopp870
+PKGNAME=	cryptopp-8.7.0
+CATEGORIES=	security
+MASTER_SITES=	${HOMEPAGE}
+EXTRACT_SUFX=	.zip
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://www.cryptopp.com/
+COMMENT=	Free C++ class library of Cryptographic Primitives
+LICENSE=	boost-license
+
+USE_LANGUAGES=		c++
+USE_TOOLS+=		gmake
+MAKE_FILE=		GNUmakefile
+WRKSRC=			${WRKDIR}
+CPPFLAGS+=		-DCRYPTOPP_DISABLE_ASM -fPIC
+
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/bin/cryptest.exe ${DESTDIR}${PREFIX}/bin/cryptest
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/crypto++/PLIST b/crypto++/PLIST
new file mode 100644
index 0000000000..4715ea5d87
--- /dev/null
+++ b/crypto++/PLIST
@@ -0,0 +1,351 @@
+@comment $NetBSD: PLIST,v 1.10 2022/10/02 16:20:26 nros Exp $
+bin/cryptest
+include/cryptopp/3way.h
+include/cryptopp/adler32.h
+include/cryptopp/adv_simd.h
+include/cryptopp/aes.h
+include/cryptopp/aes_armv4.h
+include/cryptopp/algebra.h
+include/cryptopp/algparam.h
+include/cryptopp/allocate.h
+include/cryptopp/arc4.h
+include/cryptopp/argnames.h
+include/cryptopp/aria.h
+include/cryptopp/arm_simd.h
+include/cryptopp/asn.h
+include/cryptopp/authenc.h
+include/cryptopp/base32.h
+include/cryptopp/base64.h
+include/cryptopp/basecode.h
+include/cryptopp/bench.h
+include/cryptopp/blake2.h
+include/cryptopp/blowfish.h
+include/cryptopp/blumshub.h
+include/cryptopp/camellia.h
+include/cryptopp/cast.h
+include/cryptopp/cbcmac.h
+include/cryptopp/ccm.h
+include/cryptopp/chacha.h
+include/cryptopp/chachapoly.h
+include/cryptopp/cham.h
+include/cryptopp/channels.h
+include/cryptopp/cmac.h
+include/cryptopp/config.h
+include/cryptopp/config_align.h
+include/cryptopp/config_asm.h
+include/cryptopp/config_cpu.h
+include/cryptopp/config_cxx.h
+include/cryptopp/config_dll.h
+include/cryptopp/config_int.h
+include/cryptopp/config_misc.h
+include/cryptopp/config_ns.h
+include/cryptopp/config_os.h
+include/cryptopp/config_ver.h
+include/cryptopp/cpu.h
+include/cryptopp/crc.h
+include/cryptopp/cryptlib.h
+include/cryptopp/darn.h
+include/cryptopp/default.h
+include/cryptopp/des.h
+include/cryptopp/dh.h
+include/cryptopp/dh2.h
+include/cryptopp/dll.h
+include/cryptopp/dmac.h
+include/cryptopp/donna.h
+include/cryptopp/donna_32.h
+include/cryptopp/donna_64.h
+include/cryptopp/donna_sse.h
+include/cryptopp/drbg.h
+include/cryptopp/dsa.h
+include/cryptopp/eax.h
+include/cryptopp/ec2n.h
+include/cryptopp/eccrypto.h
+include/cryptopp/ecp.h
+include/cryptopp/ecpoint.h
+include/cryptopp/elgamal.h
+include/cryptopp/emsa2.h
+include/cryptopp/eprecomp.h
+include/cryptopp/esign.h
+include/cryptopp/factory.h
+include/cryptopp/fhmqv.h
+include/cryptopp/files.h
+include/cryptopp/filters.h
+include/cryptopp/fips140.h
+include/cryptopp/fltrimpl.h
+include/cryptopp/gcm.h
+include/cryptopp/gf256.h
+include/cryptopp/gf2_32.h
+include/cryptopp/gf2n.h
+include/cryptopp/gfpcrypt.h
+include/cryptopp/gost.h
+include/cryptopp/gzip.h
+include/cryptopp/hashfwd.h
+include/cryptopp/hc128.h
+include/cryptopp/hc256.h
+include/cryptopp/hex.h
+include/cryptopp/hight.h
+include/cryptopp/hkdf.h
+include/cryptopp/hmac.h
+include/cryptopp/hmqv.h
+include/cryptopp/hrtimer.h
+include/cryptopp/ida.h
+include/cryptopp/idea.h
+include/cryptopp/integer.h
+include/cryptopp/iterhash.h
+include/cryptopp/kalyna.h
+include/cryptopp/keccak.h
+include/cryptopp/lea.h
+include/cryptopp/lsh.h
+include/cryptopp/lubyrack.h
+include/cryptopp/luc.h
+include/cryptopp/mars.h
+include/cryptopp/md2.h
+include/cryptopp/md4.h
+include/cryptopp/md5.h
+include/cryptopp/mdc.h
+include/cryptopp/mersenne.h
+include/cryptopp/misc.h
+include/cryptopp/modarith.h
+include/cryptopp/modes.h
+include/cryptopp/modexppc.h
+include/cryptopp/mqueue.h
+include/cryptopp/mqv.h
+include/cryptopp/naclite.h
+include/cryptopp/nbtheory.h
+include/cryptopp/nr.h
+include/cryptopp/oaep.h
+include/cryptopp/oids.h
+include/cryptopp/osrng.h
+include/cryptopp/ossig.h
+include/cryptopp/padlkrng.h
+include/cryptopp/panama.h
+include/cryptopp/pch.h
+include/cryptopp/pkcspad.h
+include/cryptopp/poly1305.h
+include/cryptopp/polynomi.h
+include/cryptopp/ppc_simd.h
+include/cryptopp/pssr.h
+include/cryptopp/pubkey.h
+include/cryptopp/pwdbased.h
+include/cryptopp/queue.h
+include/cryptopp/rabbit.h
+include/cryptopp/rabin.h
+include/cryptopp/randpool.h
+include/cryptopp/rc2.h
+include/cryptopp/rc5.h
+include/cryptopp/rc6.h
+include/cryptopp/rdrand.h
+include/cryptopp/resource.h
+include/cryptopp/rijndael.h
+include/cryptopp/ripemd.h
+include/cryptopp/rng.h
+include/cryptopp/rsa.h
+include/cryptopp/rw.h
+include/cryptopp/safer.h
+include/cryptopp/salsa.h
+include/cryptopp/scrypt.h
+include/cryptopp/seal.h
+include/cryptopp/secblock.h
+include/cryptopp/secblockfwd.h
+include/cryptopp/seckey.h
+include/cryptopp/seed.h
+include/cryptopp/serpent.h
+include/cryptopp/serpentp.h
+include/cryptopp/sha.h
+include/cryptopp/sha1_armv4.h
+include/cryptopp/sha256_armv4.h
+include/cryptopp/sha3.h
+include/cryptopp/sha512_armv4.h
+include/cryptopp/shacal2.h
+include/cryptopp/shake.h
+include/cryptopp/shark.h
+include/cryptopp/simeck.h
+include/cryptopp/simon.h
+include/cryptopp/simple.h
+include/cryptopp/siphash.h
+include/cryptopp/skipjack.h
+include/cryptopp/sm3.h
+include/cryptopp/sm4.h
+include/cryptopp/smartptr.h
+include/cryptopp/sosemanuk.h
+include/cryptopp/speck.h
+include/cryptopp/square.h
+include/cryptopp/stdcpp.h
+include/cryptopp/strciphr.h
+include/cryptopp/tea.h
+include/cryptopp/threefish.h
+include/cryptopp/tiger.h
+include/cryptopp/trap.h
+include/cryptopp/trunhash.h
+include/cryptopp/ttmac.h
+include/cryptopp/tweetnacl.h
+include/cryptopp/twofish.h
+include/cryptopp/validate.h
+include/cryptopp/vmac.h
+include/cryptopp/wake.h
+include/cryptopp/whrlpool.h
+include/cryptopp/words.h
+include/cryptopp/xed25519.h
+include/cryptopp/xtr.h
+include/cryptopp/xtrcrypt.h
+include/cryptopp/xts.h
+include/cryptopp/zdeflate.h
+include/cryptopp/zinflate.h
+include/cryptopp/zlib.h
+lib/libcryptopp.a
+lib/libcryptopp.so
+lib/libcryptopp.so.8
+lib/libcryptopp.so.8.7
+share/cryptopp/TestData/3desval.dat
+share/cryptopp/TestData/3wayval.dat
+share/cryptopp/TestData/aria.dat
+share/cryptopp/TestData/camellia.dat
+share/cryptopp/TestData/cast128v.dat
+share/cryptopp/TestData/cast256v.dat
+share/cryptopp/TestData/descert.dat
+share/cryptopp/TestData/dh1024.dat
+share/cryptopp/TestData/dh2048.dat
+share/cryptopp/TestData/dlie1024.dat
+share/cryptopp/TestData/dlie2048.dat
+share/cryptopp/TestData/dsa1024.dat
+share/cryptopp/TestData/dsa1024b.dat
+share/cryptopp/TestData/dsa512.dat
+share/cryptopp/TestData/ecies_p160.dat
+share/cryptopp/TestData/ecies_t163.dat
+share/cryptopp/TestData/ed25519.dat
+share/cryptopp/TestData/ed25519v0.dat
+share/cryptopp/TestData/ed25519v1.dat
+share/cryptopp/TestData/elgc1024.dat
+share/cryptopp/TestData/esig1023.dat
+share/cryptopp/TestData/esig1536.dat
+share/cryptopp/TestData/esig2046.dat
+share/cryptopp/TestData/fhmqv160.dat
+share/cryptopp/TestData/fhmqv256.dat
+share/cryptopp/TestData/fhmqv384.dat
+share/cryptopp/TestData/fhmqv512.dat
+share/cryptopp/TestData/gostval.dat
+share/cryptopp/TestData/hmqv160.dat
+share/cryptopp/TestData/hmqv256.dat
+share/cryptopp/TestData/hmqv384.dat
+share/cryptopp/TestData/hmqv512.dat
+share/cryptopp/TestData/ideaval.dat
+share/cryptopp/TestData/luc1024.dat
+share/cryptopp/TestData/luc2048.dat
+share/cryptopp/TestData/lucc1024.dat
+share/cryptopp/TestData/lucc512.dat
+share/cryptopp/TestData/lucd1024.dat
+share/cryptopp/TestData/lucd512.dat
+share/cryptopp/TestData/lucs1024.dat
+share/cryptopp/TestData/lucs512.dat
+share/cryptopp/TestData/marsval.dat
+share/cryptopp/TestData/mqv1024.dat
+share/cryptopp/TestData/mqv2048.dat
+share/cryptopp/TestData/nr1024.dat
+share/cryptopp/TestData/nr2048.dat
+share/cryptopp/TestData/rabi1024.dat
+share/cryptopp/TestData/rabi2048.dat
+share/cryptopp/TestData/rc2val.dat
+share/cryptopp/TestData/rc5val.dat
+share/cryptopp/TestData/rc6val.dat
+share/cryptopp/TestData/rijndael.dat
+share/cryptopp/TestData/rsa1024.dat
+share/cryptopp/TestData/rsa2048.dat
+share/cryptopp/TestData/rsa2048a.dat
+share/cryptopp/TestData/rsa400pb.dat
+share/cryptopp/TestData/rsa400pv.dat
+share/cryptopp/TestData/rsa512a.dat
+share/cryptopp/TestData/rw1024.dat
+share/cryptopp/TestData/rw2048.dat
+share/cryptopp/TestData/saferval.dat
+share/cryptopp/TestData/serpentv.dat
+share/cryptopp/TestData/shacal2v.dat
+share/cryptopp/TestData/sharkval.dat
+share/cryptopp/TestData/skipjack.dat
+share/cryptopp/TestData/squareva.dat
+share/cryptopp/TestData/twofishv.dat
+share/cryptopp/TestData/usage.dat
+share/cryptopp/TestData/x25519.dat
+share/cryptopp/TestData/x25519v0.dat
+share/cryptopp/TestData/x25519v1.dat
+share/cryptopp/TestData/xtrdh171.dat
+share/cryptopp/TestData/xtrdh342.dat
+share/cryptopp/TestVectors/Readme.txt
+share/cryptopp/TestVectors/aead.txt
+share/cryptopp/TestVectors/aes.txt
+share/cryptopp/TestVectors/all.txt
+share/cryptopp/TestVectors/aria.txt
+share/cryptopp/TestVectors/blake2.txt
+share/cryptopp/TestVectors/blake2b.txt
+share/cryptopp/TestVectors/blake2s.txt
+share/cryptopp/TestVectors/camellia.txt
+share/cryptopp/TestVectors/ccm.txt
+share/cryptopp/TestVectors/chacha.txt
+share/cryptopp/TestVectors/chacha20poly1305.txt
+share/cryptopp/TestVectors/chacha_tls.txt
+share/cryptopp/TestVectors/cham.txt
+share/cryptopp/TestVectors/cmac.txt
+share/cryptopp/TestVectors/dlies.txt
+share/cryptopp/TestVectors/dsa.txt
+share/cryptopp/TestVectors/dsa_1363.txt
+share/cryptopp/TestVectors/dsa_rfc6979.txt
+share/cryptopp/TestVectors/eax.txt
+share/cryptopp/TestVectors/esign.txt
+share/cryptopp/TestVectors/gcm.txt
+share/cryptopp/TestVectors/hc128.txt
+share/cryptopp/TestVectors/hc256.txt
+share/cryptopp/TestVectors/hight.txt
+share/cryptopp/TestVectors/hkdf.txt
+share/cryptopp/TestVectors/hmac.txt
+share/cryptopp/TestVectors/kalyna.txt
+share/cryptopp/TestVectors/keccak.txt
+share/cryptopp/TestVectors/lea.txt
+share/cryptopp/TestVectors/lsh.txt
+share/cryptopp/TestVectors/lsh256.txt
+share/cryptopp/TestVectors/lsh512.txt
+share/cryptopp/TestVectors/lsh512_256.txt
+share/cryptopp/TestVectors/mars.txt
+share/cryptopp/TestVectors/nr.txt
+share/cryptopp/TestVectors/panama.txt
+share/cryptopp/TestVectors/poly1305_tls.txt
+share/cryptopp/TestVectors/poly1305aes.txt
+share/cryptopp/TestVectors/rabbit.txt
+share/cryptopp/TestVectors/rsa_oaep.txt
+share/cryptopp/TestVectors/rsa_pkcs1_1_5.txt
+share/cryptopp/TestVectors/rsa_pss.txt
+share/cryptopp/TestVectors/rw.txt
+share/cryptopp/TestVectors/salsa.txt
+share/cryptopp/TestVectors/seal.txt
+share/cryptopp/TestVectors/seed.txt
+share/cryptopp/TestVectors/sha.txt
+share/cryptopp/TestVectors/sha1_160_fips_180.txt
+share/cryptopp/TestVectors/sha1_fips_180.txt
+share/cryptopp/TestVectors/sha2.txt
+share/cryptopp/TestVectors/sha2_224_fips_180.txt
+share/cryptopp/TestVectors/sha2_256_fips_180.txt
+share/cryptopp/TestVectors/sha2_384_fips_180.txt
+share/cryptopp/TestVectors/sha2_512_fips_180.txt
+share/cryptopp/TestVectors/sha2_fips_180.txt
+share/cryptopp/TestVectors/sha3.txt
+share/cryptopp/TestVectors/sha3_224_fips_202.txt
+share/cryptopp/TestVectors/sha3_256_fips_202.txt
+share/cryptopp/TestVectors/sha3_384_fips_202.txt
+share/cryptopp/TestVectors/sha3_512_fips_202.txt
+share/cryptopp/TestVectors/sha3_fips_202.txt
+share/cryptopp/TestVectors/shacal2.txt
+share/cryptopp/TestVectors/shake.txt
+share/cryptopp/TestVectors/simeck.txt
+share/cryptopp/TestVectors/simon.txt
+share/cryptopp/TestVectors/siphash.txt
+share/cryptopp/TestVectors/skipjack.txt
+share/cryptopp/TestVectors/sm3.txt
+share/cryptopp/TestVectors/sm4.txt
+share/cryptopp/TestVectors/sosemanuk.txt
+share/cryptopp/TestVectors/speck.txt
+share/cryptopp/TestVectors/tea.txt
+share/cryptopp/TestVectors/threefish.txt
+share/cryptopp/TestVectors/ttmac.txt
+share/cryptopp/TestVectors/vmac.txt
+share/cryptopp/TestVectors/wake.txt
+share/cryptopp/TestVectors/whrlpool.txt
+share/cryptopp/TestVectors/xchacha.txt
+share/cryptopp/TestVectors/xts.txt
diff --git a/crypto++/buildlink3.mk b/crypto++/buildlink3.mk
new file mode 100644
index 0000000000..f98e3e43fb
--- /dev/null
+++ b/crypto++/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.14 2022/10/02 16:20:26 nros Exp $
+
+BUILDLINK_TREE+=	cryptopp
+
+.if !defined(CRYPTOPP_BUILDLINK3_MK)
+CRYPTOPP_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.cryptopp+=	cryptopp>=5.6.2
+BUILDLINK_ABI_DEPENDS.cryptopp+=	cryptopp>=8.7.0
+BUILDLINK_PKGSRCDIR.cryptopp?=		../../security/crypto++
+.endif # CRYPTOPP_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-cryptopp
diff --git a/crypto++/distinfo b/crypto++/distinfo
new file mode 100644
index 0000000000..ce525341d3
--- /dev/null
+++ b/crypto++/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.17 2022/10/02 16:20:26 nros Exp $
+
+BLAKE2s (cryptopp870.zip) = fd5a150b2213d7cec9f559ff64b56daed853f49a64a83a42dbe3c95415171a6e
+SHA512 (cryptopp870.zip) = cb85e10118b247be016b40ecf79cf3ff933a174e2e3d9280c426e57eb1ad936db42eafc19a30ec9bf5d7f08c335b1fee4dc149e1bda00d44d40d84d010f6af11
+Size (cryptopp870.zip) = 9277791 bytes
+SHA1 (patch-GNUmakefile) = 7d9ed45142c7da319cdf76e01fc97cb064a282c6
diff --git a/crypto++/patches/patch-GNUmakefile b/crypto++/patches/patch-GNUmakefile
new file mode 100644
index 0000000000..c7e7d43bd7
--- /dev/null
+++ b/crypto++/patches/patch-GNUmakefile
@@ -0,0 +1,90 @@
+$NetBSD: patch-GNUmakefile,v 1.4 2022/10/02 16:20:26 nros Exp $
+
+Avoid -march=native compiler flag.
+On Darwin, use absolute path to avoid conflict with devel/libtool.
+Fix dylib name.
+
+--- GNUmakefile.orig	2022-08-07 19:52:03.000000000 +0000
++++ GNUmakefile
+@@ -33,7 +33,7 @@ CHMOD ?= chmod
+ MKDIR ?= mkdir -p
+ 
+ LN ?= ln -sf
+-LDCONF ?= /sbin/ldconfig -n
++LDCONF ?= true
+ 
+ # Solaris provides a non-Posix sed and grep at /usr/bin
+ # Solaris 10 is missing AR in /usr/bin
+@@ -87,7 +87,7 @@ INTEL_COMPILER := $(shell $(CXX) --versi
+ 
+ # Enable shared object versioning for Linux and Solaris
+ HAS_SOLIB_VERSION ?= 0
+-ifneq ($(IS_LINUX)$(IS_HURD)$(IS_SUN),000)
++ifeq ($(IS_DARWIN),0)
+   HAS_SOLIB_VERSION := 1
+ endif
+ 
+@@ -969,42 +969,6 @@ ARFLAGS = -xar -o
+ RANLIB = true
+ endif
+ 
+-# Native build testing. Issue 'make native'.
+-ifeq ($(findstring native,$(MAKECMDGOALS)),native)
+-  NATIVE_OPT =
+-
+-  # Try GCC and compatibles first
+-  TPROG = TestPrograms/test_cxx.cpp
+-  TOPT = -march=native
+-  HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
+-  ifeq ($(strip $(HAVE_OPT)),0)
+-    NATIVE_OPT = -march=native
+-  endif # NATIVE_OPT
+-
+-  # And tune
+-  ifeq ($(NATIVE_OPT),)
+-    TOPT = -mtune=native
+-    HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
+-    ifeq ($(strip $(HAVE_OPT)),0)
+-      NATIVE_OPT = -mtune=native
+-    endif # NATIVE_OPT
+-  endif
+-
+-  # Try SunCC next
+-  ifeq ($(NATIVE_OPT),)
+-    TOPT = -native
+-    HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
+-    ifeq ($(strip $(HAVE_OPT)),0)
+-      NATIVE_OPT = -native
+-    endif # NATIVE_OPT
+-  endif
+-
+-  ifneq ($(NATIVE_OPT),)
+-    CRYPTOPP_CXXFLAGS += $(NATIVE_OPT)
+-  endif
+-
+-endif # Native
+-
+ # Undefined Behavior Sanitizer (UBsan) testing. Issue 'make ubsan'.
+ ifeq ($(findstring ubsan,$(MAKECMDGOALS)),ubsan)
+   CRYPTOPP_CXXFLAGS := $(CRYPTOPP_CXXFLAGS:-g%=-g3)
+@@ -1139,9 +1103,9 @@ ifeq ($(HAS_SOLIB_VERSION),1)
+ # Different patchlevels and minors are compatible since 6.1
+ SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR)
+ # Linux uses -Wl,-soname
+-ifneq ($(IS_LINUX)$(IS_HURD),00)
++ifneq ($(IS_LINUX)$(IS_HURD)$(IS_NETBSD),00)
+ # Linux uses full version suffix for shared library
+-SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)
++SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR)
+ SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
+ endif
+ # Solaris uses -Wl,-h
+@@ -1443,7 +1407,7 @@ ifneq ($(wildcard libcryptopp.dylib),)
+ 	@-$(MKDIR) $(DESTDIR)$(LIBDIR)
+ 	$(CP) libcryptopp.dylib $(DESTDIR)$(LIBDIR)
+ 	$(CHMOD) u=rwx,go=rx $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
+-	-install_name_tool -id $(DESTDIR)$(LIBDIR)/libcryptopp.dylib $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
++	-install_name_tool -id $(LIBDIR)/libcryptopp.dylib $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
+ endif
+ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),)
+ 	@-$(MKDIR) $(DESTDIR)$(LIBDIR)


Home | Main Index | Thread Index | Old Index