summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-12-27 17:34:43 +0000
committerMike Frysinger <vapier@gentoo.org>2006-12-27 17:34:43 +0000
commitfdd9995895fc742971a92aaabf31bb1496bc7e71 (patch)
treec976d6650f36646b061183d1e827c564f0ff2dbe /media-libs/libdvdnav/files
parentVersion bump (diff)
downloadgentoo-2-fdd9995895fc742971a92aaabf31bb1496bc7e71.tar.gz
gentoo-2-fdd9995895fc742971a92aaabf31bb1496bc7e71.tar.bz2
gentoo-2-fdd9995895fc742971a92aaabf31bb1496bc7e71.zip
Respect user CFLAGS and install m4 into proper dir.
(Portage version: 2.1.2_rc4-r1)
Diffstat (limited to 'media-libs/libdvdnav/files')
-rw-r--r--media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch
new file mode 100644
index 000000000000..9c0bdda9e206
--- /dev/null
+++ b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch
@@ -0,0 +1,29 @@
+Use CFLAGS from environment and make sure we install the .m4 into the
+correct place regardless of whether `aclocal` is installed on the host.
+
+--- configure
++++ configure
+@@ -21459,8 +21459,9 @@
+ ;;
+ esac
+
+-CFLAGS="-O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $CFLAGS"
+-DEBUG_CFLAGS="-g -DDEBUG $CFLAGS"
++CFLAGS="$CFLAGS -Wall"
++CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
++DEBUG_CFLAGS="$CFLAGS -g -DDEBUG"
+
+
+
+--- m4/Makefile.in
++++ m4/Makefile.in
+@@ -116,8 +116,7 @@
+
+ EXTRA_DIST = dvdnav.m4
+
+-@INSTALL_M4_TRUE@m4datadir = @ACLOCAL_DIR@
+-@INSTALL_M4_FALSE@m4datadir = $(datadir)/aclocal
++m4datadir = $(datadir)/aclocal
+
+ m4data_DATA = dvdnav.m4
+ subdir = m4