Package: pupnp-1.8 Version: 1:1.8.4-2 Followup-For: Bug #913541 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu disco ubuntu-patch
Attached is a patch which fixes the autopkgtest failure on 32-bit arches. In the process it also makes the pkg-config .pc file more useful; since software won't build correctly against pupnp without LFS_CFLAGS, we make these part of the pkg-config environment automatically. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru pupnp-1.8-1.8.4/debian/patches/debian-changes pupnp-1.8-1.8.4/debian/patches/debian-changes --- pupnp-1.8-1.8.4/debian/patches/debian-changes 2018-11-05 11:55:05.000000000 -0800 +++ pupnp-1.8-1.8.4/debian/patches/debian-changes 2018-11-12 10:41:27.000000000 -0800 @@ -15,6 +15,8 @@ `git clone`.) A single combined diff, containing all the changes, follows. +Index: pupnp-1.8-1.8.4/configure.ac +=================================================================== --- pupnp-1.8-1.8.4.orig/configure.ac +++ pupnp-1.8-1.8.4/configure.ac @@ -573,9 +573,6 @@ freebsd*) @@ -27,3 +29,25 @@ fi ;; esac +@@ -713,6 +710,12 @@ AC_COMPILE_IFELSE( + AC_MSG_ERROR([pthread_rwlock_t not available])])]) + echo "-------------------------------------------------------------------------------" + ++AC_MSG_CHECKING([for LFS_CFLAGS]) ++if test "$cross_compiling" != yes; then ++ lfs_cflags=$(getconf LFS_CFLAGS) ++fi ++AC_MSG_RESULT([$lfs_cflags]) ++AC_SUBST([LFS_CFLAGS], [$lfs_cflags]) + + AC_CONFIG_FILES([ + Makefile +--- pupnp-1.8-1.8.4.orig/libupnp.pc.in ++++ pupnp-1.8-1.8.4/libupnp.pc.in +@@ -7,5 +7,5 @@ Name: libupnp + Description: Linux SDK for UPnP Devices + Version: @VERSION@ + Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lixml +-Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp ++Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp @LFS_CFLAGS@ + diff -Nru pupnp-1.8-1.8.4/debian/tests/build pupnp-1.8-1.8.4/debian/tests/build --- pupnp-1.8-1.8.4/debian/tests/build 2018-11-05 11:55:05.000000000 -0800 +++ pupnp-1.8-1.8.4/debian/tests/build 2018-11-12 00:53:31.000000000 -0800 @@ -14,7 +14,7 @@ cd "$ADTTMP" # Build programs - once with raw libraries and once with pkg-config -gcc -Wall -Werror -o pupnp-test1 pupnp-test.c -I/usr/include/upnp -lupnp +gcc -Wall -Werror -o pupnp-test1 pupnp-test.c -I/usr/include/upnp -lupnp $(getconf LFS_CFLAGS) echo "build1: OK" gcc -Wall -Werror -o pupnp-test2 pupnp-test.c $(pkg-config --cflags --libs libupnp) echo "build2: OK"