summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-05-03 01:32:57 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-05-03 01:32:57 +0000
commit05b8f4becf4c3b515a794bfe5bd5619f0ec2703f (patch)
tree0d5968a7194d571dc1827bf1b609c47a75af4df0 /tools
parent30b8b873cab4552403f2bdd8608c7e4a278e9590 (diff)
force explicit iconv build, part 3
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@12160 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'tools')
-rwxr-xr-xtools/build-gtk-stack2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/build-gtk-stack b/tools/build-gtk-stack
index 4751acbb4f..8c5fa2f85f 100755
--- a/tools/build-gtk-stack
+++ b/tools/build-gtk-stack
@@ -323,7 +323,7 @@ fi
#
# step one: build glib with everything specified so that pkg-config is not used or required
#
-tar xf glib-2.32.2.tar.xz && (cd glib-2.32.2 && LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ZLIB_CFLAGS=-I$PREFIX/include ZLIB_LIBS="-L$PREFIX/lib -lz" LIBFFI_CFLAGS=-I$PREFIX/lib/libffi-3.0.10/include LIBFFI_LIBS="-L$PREFIX/lib -lffi" ./configure $GLOBAL_CONF --with-pcre=internal --disable-silent-rules && make && make install) && rm -rf glib-2.32.2 || die "glib build1 failed"
+tar xf glib-2.32.2.tar.xz && (cd glib-2.32.2 && LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ZLIB_CFLAGS=-I$PREFIX/include ZLIB_LIBS="-L$PREFIX/lib -lz" LIBFFI_CFLAGS=-I$PREFIX/lib/libffi-3.0.10/include LIBFFI_LIBS="-L$PREFIX/lib -lffi" ./configure $GLOBAL_CONF --with-pcre=internal --with-libiconv=no --disable-silent-rules && make && make install) && rm -rf glib-2.32.2 || die "glib build1 failed"
#
# step two: build pkg-config with glib flags specified so that pkg-config is not used or required
#