Hello Christian Stalp,

My NMU patch for free42-nologo_1.4.77-1.1 is below, at the end of this
message.

With the changes in the NMU patch free42-nologo builds successfully on
mips, mipsel and amd64.

Regards,

Aníbal
--
Aníbal Monsalve Salazar <anibal.monsalvesala...@imgtec.com>

debdiff free42-nologo_1.4.77-1.dsc free42-nologo_1.4.77-1.1.dsc
diff -Nru free42-nologo-1.4.77/debian/changelog 
free42-nologo-1.4.77/debian/changelog
--- free42-nologo-1.4.77/debian/changelog       2013-08-28 21:02:11.000000000 
+0100
+++ free42-nologo-1.4.77/debian/changelog       2014-05-09 09:59:05.000000000 
+0100
@@ -1,3 +1,12 @@
+free42-nologo (1.4.77-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "FTBFS on mips/mipsel due to --hash-style=both"
+    Patch by Aurelien Jarno.
+    Closes: #733280
+
+ -- Anibal Monsalve Salazar <ani...@debian.org>  Fri, 09 May 2014 09:58:46 
+0100
+
 free42-nologo (1.4.77-1) unstable; urgency=low
 
   * Initial release (Closes: #606358)
diff -Nru free42-nologo-1.4.77/debian/patches/hash-style-makefile.patch 
free42-nologo-1.4.77/debian/patches/hash-style-makefile.patch
--- free42-nologo-1.4.77/debian/patches/hash-style-makefile.patch       
1970-01-01 01:00:00.000000000 +0100
+++ free42-nologo-1.4.77/debian/patches/hash-style-makefile.patch       
2014-05-09 09:55:15.000000000 +0100
@@ -0,0 +1,27 @@
+From: Aurelien Jarno <aure...@debian.org>
+Subject: free42-nologo: FTBFS on mips/mipsel due to --hash-style=both
+Date: Sat, 28 Dec 2013 01:22:45 +0100
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733280
+
+Passing --hash-style=both, which means both sysv and gnu, doesn't make
+sense a package level, it should be done at the distribution level by
+changing the compiler defaults. Moreover it is not supported on all
+architectures.
+
+This should therefore be removed from the Makefile. This is what the
+patch below does:
+
+--- a/gtk/Makefile
++++ b/gtk/Makefile
+@@ -20,10 +20,6 @@ CXXFLAGS += -fPIC
+ LDFLAGS += -L/usr/X11R6/lib
+ LIBS := -lXmu -lX11 -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 
-lgobject-2.0 -lglib-2.0
+ 
+-ifeq "$(shell uname -s)" "Linux"
+-LDFLAGS += -Wl,--hash-style=both
+-endif
+-
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
+       shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
+       core_commands3.cc core_commands4.cc core_commands5.cc \
diff -Nru free42-nologo-1.4.77/debian/patches/series 
free42-nologo-1.4.77/debian/patches/series
--- free42-nologo-1.4.77/debian/patches/series  2013-11-23 21:44:20.000000000 
+0000
+++ free42-nologo-1.4.77/debian/patches/series  2014-05-09 09:49:51.000000000 
+0100
@@ -1 +1,2 @@
 fix-free42-makefile.patch
+hash-style-makefile.patch

Attachment: signature.asc
Description: Digital signature

Reply via email to