X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-libmng;h=f161e60469ba45209d5ad4dcae3394d611ba8636;hb=0028eaa73ae0c3bd1dbf90c4bd508ae705bc386f;hp=eb0ed8fe888052c580d8a8d81621115d4eadff6e;hpb=16cc35ba4890382ee9368a176e4f5a7fa773b7a6;p=hvlinux.git

diff --git a/stage3/cis-libmng b/stage3/cis-libmng
index eb0ed8f..f161e60 100755
--- a/stage3/cis-libmng
+++ b/stage3/cis-libmng
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name
 
 # Reading system configuration informations, functions and package versions.
@@ -6,21 +8,32 @@ source ../sysinfos
 source ../functions
 source ../packages-list
 
+PACKAGE=${1}
+shift
+CONFIGURE_OPTS=${*}
+
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${PACKAGE}
+
+cd ${LFS_TMP}/${PACKAGE}
+cp makefiles/makefile.linux Makefile
+
+case "${HVL_TARGET}" in
+    "x86_64")
+        # -fPIC is required for x86_64
+        sed -i -e "s!^CFLAGS=!CFLAGS=-fPIC !" Makefile
+        ;;
+esac
 
-cd ${LFS_TMP}/${1} &&
-cp makefiles/makefile.linux Makefile &&
-make prefix=/usr install &&
+make prefix=/usr install
 
 # The documentation files are not installed by the installation procedure,
 # so they are copied manually.
-install -v -m644 doc/man/*.3 /usr/share/man/man3 &&
-install -v -m644 doc/man/*.5 /usr/share/man/man5 &&
-install -v -m755 -d /usr/share/doc/${1} &&
-install -v -m644 doc/*.{png,txt} /usr/share/doc/${1} &&
+install -v -m644 doc/man/*.3 /usr/share/man/man3
+install -v -m644 doc/man/*.5 /usr/share/man/man5
+install -v -m755 -d /usr/share/doc/${PACKAGE}
+install -v -m644 doc/*.{png,txt} /usr/share/doc/${PACKAGE}
 
 ldconfig
 
-# Return last error
 exit $?