diff options
| author | bradleys <[email protected]> | 2014-10-26 22:05:37 +0000 |
|---|---|---|
| committer | bradleys <[email protected]> | 2014-10-26 22:05:37 +0000 |
| commit | 5b3ef3c5c0bac20825b7d793c2cb4a48cabe3a2f (patch) | |
| tree | 883f5434141c5f8f2628acbe8677c38ea079d479 /contrib | |
| parent | 95a7f638ad658a7fe3c37200f6dd877a32df5f72 (diff) | |
contrib: Fix libgnurx to use mingw's ar.
Thanks to KonaB1end for help connecting the dots!
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6469 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libgnurx/P00-mingw-static.patch | 30 | ||||
| -rw-r--r-- | contrib/libgnurx/module.defs | 3 |
2 files changed, 27 insertions, 6 deletions
diff --git a/contrib/libgnurx/P00-mingw-static.patch b/contrib/libgnurx/P00-mingw-static.patch index 693b39d8f..9430042cf 100644 --- a/contrib/libgnurx/P00-mingw-static.patch +++ b/contrib/libgnurx/P00-mingw-static.patch @@ -1,12 +1,20 @@ -diff -ur mingw-libgnurx-2.5.1/Makefile.in.orig mingw-libgnurx-2.5.1/Makefile.in ---- mingw-libgnurx-2.5.1/Makefile.in.orig 2007-05-07 15:28:28.000000000 -0400 -+++ mingw-libgnurx-2.5.1/Makefile.in 2014-10-11 14:10:50.000000000 -0400 -@@ -72,11 +72,19 @@ libgnurx-$(DLLVERSION).dll libgnurx.dll.a: $(OBJEC +diff -ur mingw-libgnurx-2.5.1.orig/Makefile.in mingw-libgnurx-2.5.1/Makefile.in +--- mingw-libgnurx-2.5.1.orig/Makefile.in 2007-05-07 15:28:28.000000000 -0400 ++++ mingw-libgnurx-2.5.1/Makefile.in 2014-10-26 02:56:15.000000000 -0400 +@@ -38,6 +38,7 @@ + bindir = @bindir@ + mandir = @mandir@ + ++AR = @AR@ + CC = @CC_QUALIFIED@ + CFLAGS = @CFLAGS@ -I ${srcdir} + LDFLAGS = @LDFLAGS@ +@@ -72,11 +73,19 @@ libregex.a: libgnurx.dll.a cp -p libgnurx.dll.a $@ +libregex.a-static: $(OBJECTS) -+ ar rscu libregex.a $(OBJECTS) ++ $(AR) rcsu libregex.a $(OBJECTS) + gnurx.lib: libgnurx-$(DLLVERSION).dll $(MSVCLIB) -def:libgnurx.def -out:gnurx.lib @@ -21,4 +29,14 @@ diff -ur mingw-libgnurx-2.5.1/Makefile.in.orig mingw-libgnurx-2.5.1/Makefile.in install-dll: mkdir -p ${bindir} cp -p $(BINDIST_FILES) ${bindir} - +diff -ur mingw-libgnurx-2.5.1.orig/configure.ac mingw-libgnurx-2.5.1/configure.ac +--- mingw-libgnurx-2.5.1.orig/configure.ac 2014-10-26 02:48:55.000000000 -0400 ++++ mingw-libgnurx-2.5.1/configure.ac 2014-10-26 02:49:13.000000000 -0400 +@@ -75,6 +75,7 @@ + # + AC_SUBST([GNURX_LIB]) + AC_SUBST([CC_QUALIFIED], ["$CC $CC_QUALIFIED"]) ++ AC_SUBST([AR]) + LDFLAGS="$LDFLAGS -Wl,--enable-auto-image-base -Wl,--out-implib,libgnurx.dll.a" + test -n "${GNURX_LIB}" && LDFLAGS="$LDFLAGS -Wl,--output-def,libgnurx.def" + AC_CONFIG_FILES([Makefile]) diff --git a/contrib/libgnurx/module.defs b/contrib/libgnurx/module.defs index f8ca1995f..3d73829f7 100644 --- a/contrib/libgnurx/module.defs +++ b/contrib/libgnurx/module.defs @@ -4,6 +4,9 @@ $(eval $(call import.CONTRIB.defs,LIBGNURX)) LIBGNURX.FETCH.url = http://download.handbrake.fr/handbrake/contrib/mingw-libgnurx-2.5.1-src.tar.gz LIBGNURX.EXTRACT.tarbase = mingw-libgnurx-2.5.1 +LIBGNURX.CONFIGURE.env += AR="$(AR.exe)" +LIBGNURX.CONFIGURE.bootstrap = autoreconf -fiv; + LIBGNURX.BUILD.ntargets = libregex.a-static define LIBGNURX.INSTALL |