Author: sascha-guest
Date: 2014-11-12 09:51:53 +0000 (Wed, 12 Nov 2014)
New Revision: 18477
Added:
trunk/packages/aegean/trunk/debian/patches/fix_m64_on_some_archs
Modified:
trunk/packages/aegean/trunk/debian/patches/series
Log:
address -m64 on (ia64, alpha, mips64, mips64el, aarch64)
Added: trunk/packages/aegean/trunk/debian/patches/fix_m64_on_some_archs
===================================================================
--- trunk/packages/aegean/trunk/debian/patches/fix_m64_on_some_archs
(rev 0)
+++ trunk/packages/aegean/trunk/debian/patches/fix_m64_on_some_archs
2014-11-12 09:51:53 UTC (rev 18477)
@@ -0,0 +1,79 @@
+--- a/Makefile
++++ b/Makefile
+@@ -37,6 +37,8 @@
+ CC=gcc
+ CFLAGS += -Wall -DAGN_DATA_PATH='"$(prefix)/share/aegean"' -Wno-unused-result
+ GTFLAGS=prefix=$(prefix)
++SYSTEM:=$(shell uname -s)
++MACHINE:=$(shell uname -m)
+ ifeq ($(cairo),no)
+ CFLAGS += -DWITHOUT_CAIRO
+ GTFLAGS += cairo=no
+@@ -48,8 +50,10 @@
+ CFLAGS += -O3
+ endif
+ ifneq ($(64bit),no)
+- CFLAGS += -m64
+- GTFLAGS += 64bit=yes
++ ifeq (,$(filter $(MACHINE),ia64 alpha mips64 mips64el aarch64))
++ CFLAGS += -m64
++ GTFLAGS += 64bit=yes
++ endif
+ endif
+ ifneq ($(debug),no)
+ CFLAGS += -g
+@@ -72,7 +76,7 @@
+
+ # Targets
+ all: $(BINS) libaegean.a
+-
++
+
+ install: all
+ @- test -d $(prefix)/bin || mkdir -p $(prefix)/bin
+@@ -86,11 +90,11 @@
+ @- test -d $(prefix)/share/aegean || mkdir -p
$(prefix)/share/aegean
+ cp -r data/share/* $(prefix)/share/aegean/
+
+-uninstall:
++uninstall:
+ rm -r $(prefix)/$(PE_EXE)
+ rm -r $(prefix)/share/parseval
+
+-clean:
++clean:
+ rm -rf README $(BINS) $(UT_EXE) libaegean.a $(CLSS_MDL_OBJS)
inc/core/AgnVersion.h bin/*.dSYM
+
+ $(AGN_OBJS): obj/%.o : src/core/%.c inc/core/%.h inc/core/AgnVersion.h
+@@ -100,7 +104,7 @@
+ $(VN_OBJS): obj/%.o : src/VAnG/%.c inc/VAnG/%.h inc/core/AgnVersion.h
+ @- mkdir -p obj
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCS) -c -o $@ $<
+-
++
+ $(PE_EXE): src/ParsEval/parseval.c src/ParsEval/pe_options.c
src/ParsEval/pe_utils.c src/ParsEval/pe_options.h src/ParsEval/pe_utils.h
$(AGN_OBJS)
+ @- mkdir -p bin
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCS) -I src/ParsEval -o $@
$(AGN_OBJS) src/ParsEval/parseval.c src/ParsEval/pe_options.c
src/ParsEval/pe_utils.c $(LDFLAGS)
+@@ -108,7 +112,7 @@
+ $(CN_EXE): src/canon-gff3.c $(AGN_OBJS)
+ @- mkdir -p bin
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCS) -o $@ $(AGN_OBJS)
src/canon-gff3.c $(LDFLAGS)
+-
++
+ $(VN_EXE): src/VAnG/vang.c $(VN_OBJS)
+ @- mkdir -p bin
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(INCS) -o $@ $(VN_OBJS)
src/VAnG/vang.c $(LDFLAGS)
+@@ -132,11 +136,11 @@
+ libaegean.a: $(AGN_OBJS)
+ ar ru libaegean.a $(AGN_OBJS)
+
+-inc/core/AgnVersion.h:
++inc/core/AgnVersion.h:
+ @- bash -c "if [ -d .git ]; then perl
data/scripts/version.pl > inc/core/AgnVersion.h; else perl
data/scripts/version.pl --link=$(AGN_LINK) --date=$(AGN_DATE)
--version=$(AGN_VERSION) > inc/core/AgnVersion.h; fi"
+
+ test: agn-test
+-
++
+
+ agn-test: all
+ @ $(LDPATH) $(MEMCHECK) bin/unittests
Modified: trunk/packages/aegean/trunk/debian/patches/series
===================================================================
--- trunk/packages/aegean/trunk/debian/patches/series 2014-11-12 08:58:35 UTC
(rev 18476)
+++ trunk/packages/aegean/trunk/debian/patches/series 2014-11-12 09:51:53 UTC
(rev 18477)
@@ -4,3 +4,4 @@
remove_license
includepaths
add_version
+fix_m64_on_some_archs
_______________________________________________
debian-med-commit mailing list
debian-med-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
