[vlc-devel] commit: Contribs for Linux x64 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: 1.0-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jun  1 16:23:37 2009 +0200| [ac3acc83ab06023e475bfedb2dc193c54ee99d4f] | committer: Jean-Baptiste Kempf 

Contribs for Linux x64

Patch by Kaloyan Kovachev
(cherry picked from commit 2d81a38ba539a875444b053a17b839e575ca0f3d)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ac3acc83ab06023e475bfedb2dc193c54ee99d4f
---

 extras/contrib/bootstrap    |   12 ++++++++++++
 extras/contrib/src/Makefile |    2 +-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 70e2ae3..6fa46be 100755
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -77,6 +77,9 @@ case $HOST in
     *darwin10*)
          echo "ARCH=x86_64" >> config.mak
      ;;
+    *86_64*)
+          echo "ARCH=x86_64" >> config.mak
+     ;;
     *86*)
           echo "ARCH=i386" >> config.mak
      ;;
@@ -254,6 +257,15 @@ case $HOST in
             cat src/Distributions/unix.mak >> distro.mak
         fi
     ;;
+    *86_64*linux*)
+        EXTRA_CFLAGS=" -fPIC"
+        EXTRA_CPPFLAGS=" -fPIC"
+        EXTRA_LDFLAGS=" -L/usr/lib64"
+        echo "LIBRARY_PATH = /usr/lib64" >> config.mak
+        echo "PKG_CONFIG_PATH = /usr/lib64/pkgconfig" >> config.mak
+        echo "PKG_CONFIG_LIBDIR = /usr/lib64/pkgconfig" >> config.mak
+        cat src/Distributions/unix.mak >> distro.mak
+    ;;
     *)
         if test "$HOST" = "$BUILD"; then
             if test -d "/usr/lib/pkgconfig"; then
diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 31a7f99..2084046 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1909,7 +1909,7 @@ CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd1
 ifdef HAVE_WIN32
 	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install)
 else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -lgpg-error" $(CIPHDIG) && make && make install)
 endif
 	$(INSTALL_NAME)
 	touch $@