diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-10-08 11:24:12 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-10-08 11:24:12 +0000 |
| commit | a17a510a62530af270844247c985073688d4d7cb (patch) | |
| tree | 5155ea7bc428f0af268c4c63435d0696d18b124d /package/libs/cyassl/patches/120-makefile_destdir.patch | |
| parent | 350022b54ac1dee0e1a99ef8d6391ed60ded584d (diff) | |
| download | upstream-a17a510a62530af270844247c985073688d4d7cb.tar.gz upstream-a17a510a62530af270844247c985073688d4d7cb.tar.bz2 upstream-a17a510a62530af270844247c985073688d4d7cb.zip | |
move library packages to package/libs/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33657 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libs/cyassl/patches/120-makefile_destdir.patch')
| -rw-r--r-- | package/libs/cyassl/patches/120-makefile_destdir.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/package/libs/cyassl/patches/120-makefile_destdir.patch b/package/libs/cyassl/patches/120-makefile_destdir.patch new file mode 100644 index 0000000000..bf2027440b --- /dev/null +++ b/package/libs/cyassl/patches/120-makefile_destdir.patch @@ -0,0 +1,71 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -10,19 +10,19 @@ basic: +
+ openssl-links:
+ cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \
+- ln -s ../src/.libs/libcyassl.a libssl.a; \
+- ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
++ ln -s ../src/.libs/libcyassl.a libssl.a; \
++ ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../
+
+ # !!! test -e with a .name like .libs then a * like *dylib fails so just
+ # look for the .dylib on OS X, and .so otherwise but copy all parts
+ install:
+- $(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \
+- cp -fpR include/* $(DESTDIR)$(includedir); \
+- cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \
+- cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \
+- if test -e src/.libs/libcyassl.a; then \
+- cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \
+- if test -e src/.libs/libcyassl.so; then \
+- cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \
+- if test -e src/.libs/libcyassl.dylib; then \
+- cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;
++ $(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \
++ cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \
++ cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \
++ cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \
++ if test -e src/.libs/libcyassl.a; then \
++ cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \
++ if test -e src/.libs/libcyassl.so; then \
++ cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \
++ if test -e src/.libs/libcyassl.dylib; then \
++ cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi;
+--- a/Makefile.in ++++ b/Makefile.in +@@ -647,22 +647,22 @@ basic: + + openssl-links: + cd lib; ln -s ../src/.libs/libcyassl.a libcrypto.a; \ +- ln -s ../src/.libs/libcyassl.a libssl.a; \ +- ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ ++ ln -s ../src/.libs/libcyassl.a libssl.a; \ ++ ln -s ../src/.libs/libcyassl.a libcyassl.a; cd ../ + + # !!! test -e with a .name like .libs then a * like *dylib fails so just + # look for the .dylib on OS X, and .so otherwise but copy all parts + install: +- $(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir); \ +- cp -fpR include/* $(DESTDIR)$(includedir); \ +- cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir); \ +- cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ +- if test -e src/.libs/libcyassl.a; then \ +- cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ +- if test -e src/.libs/libcyassl.so; then \ +- cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ +- if test -e src/.libs/libcyassl.dylib; then \ +- cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; ++ $(mkinstalldirs) $(DESTDIR)$(includedir)/cyassl $(DESTDIR)$(libdir); \ ++ cp -fpR include/* $(DESTDIR)$(includedir)/cyassl; \ ++ cp -fpR ctaocrypt/include/* $(DESTDIR)$(includedir)/cyassl; \ ++ cp -fpR src/libcyassl.la $(DESTDIR)$(libdir); \ ++ if test -e src/.libs/libcyassl.a; then \ ++ cp -fp src/.libs/libcyassl.a $(DESTDIR)$(libdir); fi; \ ++ if test -e src/.libs/libcyassl.so; then \ ++ cp -fpR src/.libs/libcyassl.so* $(DESTDIR)$(libdir); fi; \ ++ if test -e src/.libs/libcyassl.dylib; then \ ++ cp -fpR src/.libs/libcyassl.*dylib $(DESTDIR)$(libdir); fi; + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |