Source: cccd
Version: 0.3beta4-7.1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
cccd fails to cross build from source, because it hard codes the build
architecture compiler gcc and the build architecture pkg-config. After
making both substitutable, cccd cross builds successfully. Please
consider applying the attached patch.
Helmut
diff --minimal -Nru cccd-0.3beta4/debian/changelog
cccd-0.3beta4/debian/changelog
--- cccd-0.3beta4/debian/changelog 2012-08-06 11:40:21.000000000 +0200
+++ cccd-0.3beta4/debian/changelog 2017-12-08 15:53:03.000000000 +0100
@@ -1,3 +1,10 @@
+cccd (0.3beta4-7.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Make tools (gcc, pkg-config) substitutable. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 08 Dec 2017 15:53:03 +0100
+
cccd (0.3beta4-7.1) unstable; urgency=low
* Non-maintainer upload.
diff --minimal -Nru cccd-0.3beta4/debian/patches/30_makefile_fixes.patch
cccd-0.3beta4/debian/patches/30_makefile_fixes.patch
--- cccd-0.3beta4/debian/patches/30_makefile_fixes.patch 2012-04-08
23:23:03.000000000 +0200
+++ cccd-0.3beta4/debian/patches/30_makefile_fixes.patch 2017-12-08
15:52:42.000000000 +0100
@@ -1,9 +1,13 @@
# Various Makefile fixes.
--- cccd-0.3beta4.orig/Makefile
+++ cccd-0.3beta4/Makefile
-@@ -7,39 +7,42 @@
- CC = gcc
+@@ -4,57 +4,66 @@
+ OTHERS = Makefile CHANGES README TODO README.original BUGREPORT COPYING
+ TARGET = cccd
+
+-CC = gcc
++PKG_CONFIG ?= pkg-config
# you may need to change this
-MAILPROG = "/bin/mail -i"
@@ -17,16 +23,16 @@
-LDFLAGS = `gtk-config --libs`
+
+
-+MY_CFLAGS = `pkg-config --cflags gtk+-2.0`
++MY_CFLAGS = `$(PKG_CONFIG) --cflags gtk+-2.0`
+
-+#MY_LDFLAGS = -lefence `pkg-config --libs gtk+-2.0`
-+MY_LDFLAGS = -L/usr/lib `pkg-config --libs gtk+-2.0`
++#MY_LDFLAGS = -lefence `$(PKG_CONFIG) --libs gtk+-2.0`
++MY_LDFLAGS = -L/usr/lib `$(PKG_CONFIG) --libs gtk+-2.0`
# production flags (no debugging)
-#CFLAGS = -O2 -Wall `gtk-config --cflags`
-#LDFLAGS = -s `gtk-config --libs`
-+#MY_CFLAGS = -O2 -Wall `pkg-config --cflags gtk+-2.0`
-+#MY_LDFLAGS = -s `pkg-config --libs gtk+-2.0`
++#MY_CFLAGS = -O2 -Wall `$(PKG_CONFIG) --cflags gtk+-2.0`
++#MY_LDFLAGS = -s `$(PKG_CONFIG) --libs gtk+-2.0`
prefix=/usr/local
bindir=$(prefix)/bin
@@ -45,7 +51,7 @@
$(TARGET): $(OBJECTS)
- gcc -o $(TARGET) $(OBJECTS) $(CFLAGS) $(LDFLAGS)
-+ gcc -o $(TARGET) $(OBJECTS) $(CFLAGS) $(MY_CFLAGS) $(LDFLAGS)
$(MY_LDFLAGS)
++ $(CC) -o $(TARGET) $(OBJECTS) $(CFLAGS) $(MY_CFLAGS) $(LDFLAGS)
$(MY_LDFLAGS)
install: $(TARGET)
mkdir -p $(bindir)
@@ -57,7 +63,10 @@
@echo "Please read the README for additional installation hints"
static: $(OBJECTS)
-@@ -49,12 +52,18 @@
+ # gcc -o $(TARGET).static $(OBJECTS) -L/usr/lib -L/usr/X11R6/lib
-Wl,-Bstatic -lgtk -lgdk -lglib -Wl,-Bdynamic -lXext -lX11 -lm
+- gcc -static -o $(TARGET).static $(OBJECTS) -L/usr/lib -L/usr/X11R6/lib
-lgtk -lgdk -lglib -lXext -lX11 -lm
++ $(CC) -static -o $(TARGET).static $(OBJECTS) -L/usr/lib
-L/usr/X11R6/lib -lgtk -lgdk -lglib -lXext -lX11 -lm
+
clean:
rm -rf core *.o $(TARGET)
