Author: tille
Date: 2014-09-22 12:57:19 +0000 (Mon, 22 Sep 2014)
New Revision: 18086
Added:
trunk/packages/phylip/trunk/debian/patches/do_not_install_jar_files.patch
trunk/packages/phylip/trunk/debian/patches/soname.patch
Modified:
trunk/packages/phylip/trunk/debian/patches/install_fonts_data.patch
trunk/packages/phylip/trunk/debian/patches/series
Log:
Patches for JAR files and sonames for dynamic libraries
Added: trunk/packages/phylip/trunk/debian/patches/do_not_install_jar_files.patch
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/do_not_install_jar_files.patch
(rev 0)
+++ trunk/packages/phylip/trunk/debian/patches/do_not_install_jar_files.patch
2014-09-22 12:57:19 UTC (rev 18086)
@@ -0,0 +1,20 @@
+Author: Andreas Tille <[email protected]>
+Last-Update: Wed, 17 Sep 2014 19:35:06 +0200
+Description: The binary JAR files without source are stripped from the
+ source tarball so do not try to install these files
+
+--- a/src/Makefile.unx
++++ b/src/Makefile.unx
+@@ -225,10 +225,8 @@ put:
+ @echo "Installing PHYLIP v3.6 binaries in $(EXEDIR)"
+ @mkdir -p $(EXEDIR)
+ @cp $(PROGS) $(EXEDIR)
+- @echo "Installing dynamic libraries in $(EXEDIR)"
+- @cp $(DYLIBS) $(EXEDIR)
+- @echo "Installing jar files in $(EXEDIR)"
+- @cp $(JARS) $(EXEDIR)
++ #@cp $(DYLIBS) $(EXEDIR)
++ #@cp $(JARS) $(EXEDIR)
+ @echo "Installing font files in $(DATADIR)"
+ @mkdir -p $(DATADIR)
+ @cp font* $(DATADIR)
Modified: trunk/packages/phylip/trunk/debian/patches/install_fonts_data.patch
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/install_fonts_data.patch
2014-09-22 12:09:01 UTC (rev 18085)
+++ trunk/packages/phylip/trunk/debian/patches/install_fonts_data.patch
2014-09-22 12:57:19 UTC (rev 18086)
@@ -32,7 +32,7 @@
+distclean: clean
+ @echo "Removing executables"
-+ @rm -rf $(EXEDIR) $(DATADIR)
++ @rm -rf $(EXEDIR)/* $(DATADIR)/*
+ @echo "Finaly removed all executable files."
+ @echo ""
+
Modified: trunk/packages/phylip/trunk/debian/patches/series
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/series 2014-09-22 12:09:01 UTC
(rev 18085)
+++ trunk/packages/phylip/trunk/debian/patches/series 2014-09-22 12:57:19 UTC
(rev 18086)
@@ -1,3 +1,5 @@
install_fonts_data.patch
hardening.patch
01_src_phylip_h
+do_not_install_jar_files.patch
+soname.patch
Added: trunk/packages/phylip/trunk/debian/patches/soname.patch
===================================================================
--- trunk/packages/phylip/trunk/debian/patches/soname.patch
(rev 0)
+++ trunk/packages/phylip/trunk/debian/patches/soname.patch 2014-09-22
12:57:19 UTC (rev 18086)
@@ -0,0 +1,24 @@
+Author: Andreas Tille <[email protected]>
+Last-Update: Wed, 17 Sep 2014 19:35:06 +0200
+Description: Add soname to shared libraries
+
+--- a/src/Makefile.unx
++++ b/src/Makefile.unx
+@@ -365,7 +365,7 @@ drawgram: drawgram.o draw.o draw2.o
+
+ # needed by java
+ libdrawgram.so: drawgram.o draw.o draw2.o phylip.o
+- $(CC) $(CFLAGS) -o libdrawgram.so -shared -fPIC drawgram.c draw.c
draw2.c phylip.c $(CLIBS) $(LDFLAGS)
++ $(CC) $(CFLAGS) -o libdrawgram.so -Wl,-soname,libdrawgram.so -shared
-fPIC drawgram.c draw.c draw2.c phylip.c $(DLIBS)
+
+ drawtree.o: drawtree.c draw.h phylip.h
+ $(CC) $(DFLAGS) -shared -fPIC -c drawtree.c
+@@ -375,7 +375,7 @@ drawtree: drawtree.o draw.o draw2.o
+
+ # needed by java
+ libdrawtree.so: drawtree.o draw.o draw2.o phylip.o
+- $(CC) $(CFLAGS) -o libdrawtree.so -shared -fPIC drawtree.c draw.c
draw2.c phylip.c $(CLIBS) $(LDFLAGS)
++ $(CC) $(CFLAGS) -o libdrawtree.so -Wl,-soname,libdrawtree.so -shared
-fPIC drawtree.c draw.c draw2.c phylip.c $(DLIBS)
+
+ factor.o: factor.c phylip.h
+
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
