archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-03-19 00:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/crypto++ fixes

Browse source
This commit is contained in:
Kevin Mihelich 2013-05-21 21:45:27 +00:00
parent df4decaaf4
commit 6e5b52f41d
2 changed files with 43 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
extra/crypto++/PKGBUILD
View file

@ -9,8 +9,6 @@
# - fix_build_system.patch to use libtool for compilation # - fix_build_system.patch to use libtool for compilation
# - removed making libcryptopp.so, adjusted packaging for .libs # - removed making libcryptopp.so, adjusted packaging for .libs
plugrel=1
pkgname=crypto++ pkgname=crypto++
pkgver=5.6.2 pkgver=5.6.2
_srcver=562 _srcver=562
@ -24,15 +22,15 @@ makedepends=('unzip')
source=("http://www.cryptopp.com/cryptopp${_srcver}.zip" source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
'libcrypto++.pc' 'libcrypto++.pc'
'fix_build_system.patch') 'fix_build_system.patch')
md5sums=('96cbeba0907562b077e26bcffb483828' md5sums=('7ed022585698df48e65ce9218f6c6a67'
'46de3847c59ad16456fa863eb33e73b2' '46de3847c59ad16456fa863eb33e73b2'
'8d454c524bafc05aa842ddfc63d8431d') '7ba22254fea73c1a9bd308ff6e034856')
build() { build() {
cd ${srcdir} cd ${srcdir}
# ALARM # ALARM
patch -p0 -i fix_build_system.patch patch -p1 -i fix_build_system.patch
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC" export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"

82
extra/crypto++/fix_build_system.patch
View file

@ -1,10 +1,10 @@
--- GNUmakefile --- cryptopp562/GNUmakefile
+++ GNUmakefile +++ cryptopp562/GNUmakefile
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
+LIBTOOL = libtool +LIBTOOL = libtool
+LIBDIR = lib +LIBDIR = lib
CXXFLAGS = -DNDEBUG -g -O2 CXXFLAGS = -DNDEBUG -g -O2
#CXXFLAGS = -g # -O3 fails to link on Cygwin GCC version 4.5.3
# -fPIC is supported. Please report any breakage of -fPIC as a bug. # -fPIC is supported. Please report any breakage of -fPIC as a bug.
@@ -7,8 +9,9 @@ @@ -7,8 +9,9 @@
# LDFLAGS += -Wl,--gc-sections # LDFLAGS += -Wl,--gc-sections
@ -17,35 +17,19 @@
EGREP = egrep EGREP = egrep
UNAME = $(shell uname) UNAME = $(shell uname)
ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64") ISX86 = $(shell uname -m | $(EGREP) -c "i.86|x86|i86|amd64")
@@ -77,8 +80,11 @@ @@ -79,8 +82,11 @@
CXXFLAGS += -pipe LDLIBS += -lws2_32
endif endif
+THREAD_LIBS = +THREAD_LIBS =
+ +
ifeq ($(UNAME),Linux) ifeq ($(IS_LINUX),1)
LDFLAGS += -pthread LDFLAGS += -pthread
+THREAD_LIBS += -lpthread +THREAD_LIBS += -lpthread
ifneq ($(shell uname -i | $(EGREP) -c "(_64|d64)"),0) ifneq ($(shell uname -i | $(EGREP) -c "(_64|d64)"),0)
M32OR64 = -m64 M32OR64 = -m64
endif endif
@@ -99,8 +105,6 @@ @@ -126,54 +132,52 @@
ifeq ($(UNAME),SunOS)
LDLIBS += -lnsl -lsocket
M32OR64 = -m$(shell isainfo -b)
-endif
-
ifneq ($(IS_SUN_CC),0) # override flags for CC Sun C++ compiler
CXXFLAGS = -DNDEBUG -O -g0 -native -template=no%extdef $(M32OR64)
LDFLAGS =
@@ -114,52 +118,52 @@
CXXFLAGS += -DCRYPTOPP_INCLUDE_VECTOR_CC
endif
endif
+endif
SRCS = $(wildcard *.cpp)
ifeq ($(SRCS),) # workaround wildcard function bug in GNU Make 3.77
SRCS = $(shell echo *.cpp) SRCS = $(shell echo *.cpp)
endif endif
@ -62,12 +46,15 @@
-LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o) -LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o)
-TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o) -TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o)
-DLLTESTOBJS = dlltest.dllonly.o -DLLTESTOBJS = dlltest.dllonly.o
-
-all: cryptest.exe
-static: libcryptopp.a
-dynamic: libcryptopp.so
+DLLOBJS = $(DLLSRCS:.cpp=.export.lo) +DLLOBJS = $(DLLSRCS:.cpp=.export.lo)
+LIBIMPORTOBJS = $(LIBOBJS:.lo=.import.lo) +LIBIMPORTOBJS = $(LIBOBJS:.lo=.import.lo)
+TESTIMPORTOBJS = $(TESTOBJS:.lo=.import.lo) +TESTIMPORTOBJS = $(TESTOBJS:.lo=.import.lo)
+DLLTESTOBJS = dlltest.dllonly.lo +DLLTESTOBJS = dlltest.dllonly.lo
+
-all: cryptest.exe
+all: libcryptopp.la +all: libcryptopp.la
-test: cryptest.exe -test: cryptest.exe
@ -76,27 +63,38 @@
+ ./cryptest v + ./cryptest v
clean: clean:
- $(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS) - -$(RM) cryptest.exe libcryptopp.a libcryptopp.so $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTI MPORTOBJS) $(DLLTESTOBJS)
+ $(RM) -f .libs cryptest libcrypto++.* libcryptopp.* $(LIBOBJS) $(TESTOBJS) cryptopp.dll cryptest.import dlltest $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS) + $(RM) -f .libs cryptest libcryptopp.* libcryptopp.* $(LIBOBJS) $(TESTOBJS) cryptopp.dll cryptest.import dlltest $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
+
install: install:
- $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin - $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin
- $(CP) *.h $(PREFIX)/include/cryptopp - -$(CP) *.h $(PREFIX)/include/cryptopp
- $(CP) *.a $(PREFIX)/lib - -$(CP) *.a $(PREFIX)/lib
- $(CP) *.so $(PREFIX)/lib - -$(CP) *.so $(PREFIX)/lib
- $(CP) *.exe $(PREFIX)/bin - -$(CP) *.exe $(PREFIX)/bin
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ $(INSTALL) -m 644 *.h $(DESTDIR)$(PREFIX)/include/cryptopp
+ $(LN_S) cryptopp $(DESTDIR)$(PREFIX)/include/cryptopp
+ $(LIBTOOL) --mode=install $(INSTALL) libcryptopp.la $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ $(LN_S) libcryptopp.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
+ $(LN_S) libcryptopp.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so
+ $(LN_S) libcryptopp.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0
+ $(LN_S) libcryptopp.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0.0.0
remove:
- -$(RM) -rf $(PREFIX)/include/cryptopp
- -$(RM) $(PREFIX)/lib/libcryptopp.a
- -$(RM) $(PREFIX)/lib/libcryptopp.so
- -$(RM) $(PREFIX)/bin/cryptest.exe
- -
-libcryptopp.a: $(LIBOBJS) -libcryptopp.a: $(LIBOBJS)
- $(AR) $(ARFLAGS) $@ $(LIBOBJS) - $(AR) $(ARFLAGS) $@ $(LIBOBJS)
- $(RANLIB) $@ - $(RANLIB) $@
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/crypto++ $(DESTDIR)$(PREFIX)/$(LIBDIR) + $(RM) -rf $(DESTDIR)$(PREFIX)/include/cryptopp
+ $(INSTALL) -m 644 *.h $(DESTDIR)$(PREFIX)/include/crypto++ + $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
+ $(LN_S) crypto++ $(DESTDIR)$(PREFIX)/include/cryptopp + $(RM) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so*
+ $(LIBTOOL) --mode=install $(INSTALL) libcrypto++.la $(DESTDIR)$(PREFIX)/$(LIBDIR) + $(RM) $(DESTDIR)$(PREFIX)/bin/cryptest
+ $(LN_S) libcrypto++.a $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.a
+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so
+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0
+ $(LN_S) libcrypto++.so.0.0.0 $(DESTDIR)$(PREFIX)/$(LIBDIR)/libcryptopp.so.0.0.0
-libcryptopp.so: $(LIBOBJS) -libcryptopp.so: $(LIBOBJS)
- $(CXX) -shared -o $@ $(LIBOBJS) - $(CXX) -shared -o $@ $(LIBOBJS)
@ -104,7 +102,7 @@
+ $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/$(LIBDIR) -o $@ $(LIBOBJS) $(THREAD_LIBS) + $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -rpath $(PREFIX)/$(LIBDIR) -o $@ $(LIBOBJS) $(THREAD_LIBS)
-cryptest.exe: libcryptopp.a $(TESTOBJS) -cryptest.exe: libcryptopp.a $(TESTOBJS)
- $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS) - $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS)
+cryptest: libcryptopp.la $(TESTOBJS) +cryptest: libcryptopp.la $(TESTOBJS)
+ $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -o $@ $(TESTOBJS) -L. -lcryptopp $(LDLIBS) $(THREAD_LIBS) + $(LIBTOOL) --tag=CXX --mode=link $(CXX) $(LDFLAGS) -o $@ $(TESTOBJS) -L. -lcryptopp $(LDLIBS) $(THREAD_LIBS)
@ -117,7 +115,7 @@
cryptopp.dll: $(DLLOBJS) cryptopp.dll: $(DLLOBJS)
$(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a $(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a
@@ -168,10 +172,10 @@ @@ -182,10 +186,10 @@
$(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS) $(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS)
$(RANLIB) $@ $(RANLIB) $@
@ -130,7 +128,7 @@
$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS) $(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
adhoc.cpp: adhoc.cpp.proto adhoc.cpp: adhoc.cpp.proto
@@ -181,14 +185,14 @@ @@ -195,14 +199,14 @@
touch adhoc.cpp touch adhoc.cpp
endif endif