Skip to content

V
vlc-gpu
Commit e536be03 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contribs: fixed libiconv hack on Darwin10

parent 8de08038
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
extras/contrib/bootstrap
View file @ e536be03
...@@ -342,6 +342,8 @@ case "$DISTRO" in ...@@ -342,6 +342,8 @@ case "$DISTRO" in
case $TARGET in case $TARGET in
x86_64*|i686*) add_enabled_makefile_cfg "HAVE_MACOSX_ON_INTEL" ;; x86_64*|i686*) add_enabled_makefile_cfg "HAVE_MACOSX_ON_INTEL" ;;
esac
case $TARGET in
*darwin10) add_enabled_makefile_cfg "HAVE_MACOSX_DARWIN_10" ;; *darwin10) add_enabled_makefile_cfg "HAVE_MACOSX_DARWIN_10" ;;
*darwin9) add_enabled_makefile_cfg "HAVE_MACOSX_DARWIN_9" ;; *darwin9) add_enabled_makefile_cfg "HAVE_MACOSX_DARWIN_9" ;;
esac esac
......
extras/contrib/contrib.mak
View file @ e536be03
...@@ -69,7 +69,7 @@ contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2: ...@@ -69,7 +69,7 @@ contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
(cd build-src && rm -rf *gecko* && $(MAKE) .gecko) (cd build-src && rm -rf *gecko* && $(MAKE) .gecko)
# libiconv.la is no longer present on Snow Leopard, so fix possible references to it, which would # libiconv.la is no longer present on Snow Leopard, so fix possible references to it, which would
# result in linking issues # result in linking issues
ifdef HAVE_DARWIN_10 ifdef HAVE_MACOSX_DARWIN_10
(cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig) (cd $(PREFIX)/lib && sed -e 's%/usr/lib/libiconv.la%$(PREFIX)/lib/libiconv.la%g' -i.orig *.la && rm -f *.la.orig)
(cd build-src && rm -f .iconv && $(MAKE) .iconv) (cd build-src && rm -f .iconv && $(MAKE) .iconv)
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment