grknight 14/07/19 13:09:15 Modified: cyphertite-2.0.2-fix-build.patch Log: Fix build system which wrongly filtered using s/-lssl//g to use s/-lssl //g . This breaks curl linked with non-OpenSSL such as nss and is bad practice anyway (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)
Revision Changes Path 1.3 app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch?r1=1.2&r2=1.3 Index: cyphertite-2.0.2-fix-build.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-backup/cyphertite/files/cyphertite-2.0.2-fix-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cyphertite-2.0.2-fix-build.patch 6 Jul 2014 15:49:17 -0000 1.2 +++ cyphertite-2.0.2-fix-build.patch 19 Jul 2014 13:09:15 -0000 1.3 @@ -42,8 +42,9 @@ # curl -CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \ +- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') +CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \ - sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') ++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g') # Compiler and linker flags. CPPFLAGS += -DNEED_LIBCLENS @@ -132,8 +133,9 @@ # curl -CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \ +- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') +CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \ - sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') ++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g') # Compiler and linker flags. CPPFLAGS += -DNEED_LIBCLENS @@ -154,8 +156,9 @@ # curl -CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \ +- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') +CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \ - sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') ++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g') # Compiler and linker flags. CPPFLAGS += -DNEED_LIBCLENS @@ -176,8 +179,9 @@ # curl -CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \ +- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') +CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \ - sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') ++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g') # Compiler and linker flags. CPPFLAGS += -DNEED_LIBCLENS @@ -198,8 +202,9 @@ # curl -CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \ +- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') +CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \ - sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') ++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g') # Compiler and linker flags. CPPFLAGS += -DNEED_LIBCLENS @@ -220,8 +225,9 @@ # curl -CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --static-libs | \ +- sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') +CURL.LDLIBS = $(shell PATH=$(BINDIR):$$PATH curl-config --libs | \ - sed -e 's/-lssl//g' -e 's/-lcrypto//g' -e 's/-lz//g' -e 's/ \+/ /g') ++ sed -e 's/-lssl //g' -e 's/-lcrypto //g' -e 's/-lz //g' -e 's/ \+/ /g') # Compiler and linker flags. CPPFLAGS += -DNEED_LIBCLENS
