Source: brp-pacu Version: 2.1.1+git20111020-7 Tags: patch upstream User: debian-cr...@lists.debian.org Usertags: ftcbfs
brp-pacu fails to cross build from source, because the upstream Makefile.am hard codes the build architecture pkg-config in a number of places. It thus fails to use the compiler flags correctly detected by the configure script. Please consider attaching the attached patch for transferring the results detected by configure to the Makefile and using them there. Doing so makes brp-pacu cross buildable. Helmut
--- brp-pacu-2.1.1+git20111020.orig/Makefile.am +++ brp-pacu-2.1.1+git20111020/Makefile.am @@ -20,8 +20,8 @@ include_HEADERS = testfft.h gui.h main.h EXTRA_DIST = BRP_PACU.ui sinc.png info.plist \ sinc.icns sinc.xcf brpData.icns README-Mac.txt INSTALL-Mac.txt movelibraries.sh -AM_CFLAGS = -O2 -Wall -g `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-2.0` `pkg-config --cflags glib-2.0` `pkg-config --cflags gtkdatabox` -DDATADIR=\"$(pkgdatadir)\" -lgthread-2.0 -LIBS = -lm -lfftw `pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-2.0` `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0` `pkg-config --libs gtkdatabox` `pkg-config --libs jack` +AM_CFLAGS = -O2 -Wall -g $(GTK_CFLAGS) $(GDK2_0_CFLAGS) $(GLIB2_0_CFLAGS) $(GTKDATABOX_CFLAGS) -DDATADIR=\"$(pkgdatadir)\" -lgthread-2.0 +LIBS = -lm -lfftw $(GTK_LIBS) $(GDK2_0_LIBS) $(GLIB2_0_LIBS) $(GTHREAD2_0_LIBS) $(GTKDATABOX_LIBS) $(JACK_LIBS) pkgdata_DATA = BRP_PACU.ui sinc.png ######### Macintosh implementation ######### if APPLE @@ -34,20 +34,20 @@ MACEXECUTABLE=$(MACCONTENTS)/MacOS/BRP_PACU MACDISK=BRP-PACU-mac-$(VERSION) AM_LDFLAGS=-framework Carbon -AM_CFLAGS += `pkg-config --cflags gdk-quartz-2.0` `pkg-config --cflags ige-mac-integration` -LIBS += `pkg-config --libs gdk-quartz-2.0` `pkg-config --libs ige-mac-integration` +AM_CFLAGS += $(DARWIN_CFLAGS) +LIBS += $(DARWIN_LIBS) $(MACCONTENTS): BRP_PACU.ui AUTHORS COPYING COPYING.LESSER NEWS ChangeLog README-Mac.txt sinc.icns brpData.icns info.plist mkdir -p $(MACRESOURCES)/en.lproj $(MACCONTENTS)/MacOS $(MACFRAMEWORKS) cp -fp BRP_PACU.ui sinc.icns brpData.icns sinc.png $(MACRESOURCES) cp -fp AUTHORS COPYING COPYING.LESSER NEWS ChangeLog README-Mac.txt $(MACRESOURCES)/en.lproj sed -e 's/VERSION/$(VERSION)/' < info.plist > $(MACCONTENTS)/info.plist echo APPLBRPP > $(MACCONTENTS)/PkgInfo - cp -fRP `pkg-config --variable=libdir gtkdatabox`/libgtkdatabox*.dylib $(MACFRAMEWORKS) + cp -fRP $(GTKDATABOX_LIBDIR)/libgtkdatabox*.dylib $(MACFRAMEWORKS) macapplication: $(MACAPPLICATION) $(MACAPPLICATION): $(bin_PROGRAMS) $(MACCONTENTS) cp $(bin_PROGRAMS) $(MACEXECUTABLE) # Change install names to be relative to the executable in the application - movelibraries.sh $(MACAPPLICATION) `pkg-config --variable=libdir gtk+-2.0` + movelibraries.sh $(MACAPPLICATION) $(GTK_LIBDIR) install_name_tool \ `otool -L $(MACEXECUTABLE) | sed -n '\:/libgtkdatabox: s/\(.*\/\)\(.*\) (.*/-change \1\2 @executable_path\/..\/Frameworks\/\2 /p'` \ $(MACEXECUTABLE) --- brp-pacu-2.1.1+git20111020.orig/configure.ac +++ brp-pacu-2.1.1+git20111020/configure.ac @@ -19,9 +19,15 @@ AC_CHECK_LIB(m,cos,,AC_MSG_ERROR([could not link to mathlib.])) AC_CHECK_LIB(fftw,fftw_create_plan,,AC_MSG_ERROR([could not link to fftw please install the fftw package.])) PKG_CHECK_MODULES(GTK, gtk+-2.0,,exit) +AC_SUBST([GTK_LIBDIR],[`$PKG_CONFIG --variable=libdir gtk+-2.0`]) PKG_CHECK_MODULES(PANGO, pango,,exit) PKG_CHECK_MODULES(CAIRO, cairo,,exit) -#PKG_CHECK_MODULES(GDK-2.0, gdk-2.0,,exit) +PKG_CHECK_MODULES(GDK2_0, gdk-2.0,,exit) PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox,,AC_MSG_ERROR([please install gtkdatabox development version.])) +AC_SUBST([GTKDATABOX_LIBDIR],[`$PKG_CONFIG --variable=libdir gtkdatabox`]) PKG_CHECK_MODULES(JACK, jack,,AC_MSG_ERROR([please install the jack development version.])) - +PKG_CHECK_MODULES(GLIB2_0, glib-2.0,,exit) +PKG_CHECK_MODULES(GTKDATABOX, gtkdatabox,,exit) +PKG_CHECK_MODULES(GTHREAD2_0, gthread-2.0,,exit) +AS_IF([test `uname` = 'Darwin'],[PKG_CHECK_MODULES(DARWIN,[gdk-quartz-2.0 ige-mac-integration],,exit)]) +AC_OUTPUT