[gimp] build/win: Patch libmng's Makefile.in instead of Makefile.am
- From: Michael Henning <mhenning src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] build/win: Patch libmng's Makefile.in instead of Makefile.am
- Date: Fri, 3 Apr 2015 17:41:49 +0000 (UTC)
commit 6b186266b1e2dfa71051802da39fa170da2b02aa
Author: Michael Henning <drawoc darkrefraction com>
Date: Fri Apr 3 13:35:17 2015 -0400
build/win: Patch libmng's Makefile.in instead of Makefile.am
It's hacky, but it removes the dependency on a specific
automake version.
build/windows/jhbuild/imglibs.moduleset | 4 ++--
.../patches/libmng-no-undefined-makefile-in.patch | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/build/windows/jhbuild/imglibs.moduleset b/build/windows/jhbuild/imglibs.moduleset
index c685afb..b2b56ec 100644
--- a/build/windows/jhbuild/imglibs.moduleset
+++ b/build/windows/jhbuild/imglibs.moduleset
@@ -61,11 +61,11 @@
</dependencies>
</metamodule>
-<autotools id="libmng" autogen-sh="bootstrap.sh; ./configure">
+<autotools id="libmng" autogen-sh="configure">
<branch version="2.0.2" repo="sf.net"
module="libmng/libmng-devel/2.0.2/libmng-2.0.2.tar.xz"
hash="sha1:7dd35369ff5916e1823cbacef984ab1b87714b69">
- <patch file="libmng-no-undefined.diff" strip="1"/>
+ <patch file="libmng-no-undefined-makefile-in.patch" strip="1"/>
</branch>
<dependencies>
<dep package="zlib"/>
diff --git a/build/windows/jhbuild/patches/libmng-no-undefined-makefile-in.patch
b/build/windows/jhbuild/patches/libmng-no-undefined-makefile-in.patch
new file mode 100644
index 0000000..59fea12
--- /dev/null
+++ b/build/windows/jhbuild/patches/libmng-no-undefined-makefile-in.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in 2015-04-03 13:27:40.555911000 -0400
++++ b/Makefile.in 2015-04-03 13:27:56.295616631 -0400
+@@ -369,7 +369,7 @@
+
+ # libmng release @VERSION@
+ libmng_la_LDFLAGS = \
+- -version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@
++ -version-number @MNG_MAJOR_NR@:@MNG_MINOR_NR@:@MNG_RELEASE_NR@ -no-undefined
+
+ lib_LTLIBRARIES = libmng.la
+ include_HEADERS = libmng.h libmng_conf.h libmng_types.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]