Changeset 22150

Timestamp:

2010-05-21T15:42:09+12:00 (14 years ago)

Author:

davidb

Message:

Minor tweak to help with cross-compile with libtool

Location:

gs2-extensions/music-stand/trunk/runtime-srcpack/packages/CASCADE-MAKE

Files:

• EVINCE.sh (modified) (2 diffs)
• LIB-POPPLER.sh (modified) (2 diffs)

gs2-extensions/music-stand/trunk/runtime-srcpack/packages/CASCADE-MAKE/EVINCE.sh

@@ -13 +13 @@
 export LDFLAGS="-L$prefix/lib"
 
+export POPPLER_CFLAGS="-I$prefix/include/poppler/glib"
+export POPPLER_LIBS="-L$prefix/lib -lpoppler-glib -lpoppler"
+
+
 if [ ! -z $CROSSCOMPILE ] ; then
-  export LDFLAGS="$LDFLAGS -L/usr/local/poky/eabi-glibc/arm/arm-poky-linux-gnueabi/usr/lib"
+  export LIBTOOL=arm-poky-linux-gnueabi-libtool
+  export PATH=$PATH:$prefix/devel/bin
 
-  # Needs a bit of help so it can pass the test that looks for
-  # 'dbus-binding-tool'
+#  export LDFLAGS="$LDFLAGS -L/usr/local/poky/eabi-glibc/arm/arm-poky-linux-gnueabi/usr/lib"
 
-  echo "**** You might need to do the following to get 'dbus-binding-tool'"
-  echo "**** installed"
-  echo "****   sudo apt-get install libdbus-glib-1-dev"
-  echo "****"
-  ## export PATH=$PATH:$prefix/devel/bin
 fi
+
 
 
@@ -33 +33 @@
 opt_run_make $compile   $package $version
 opt_run_make $install   $package $version "install"
+
+if [ $install = "1" ] ; then
+  pushd $prefix/lib ; 
+  for f in libdocument.la libpdf; do
+    sed -i~ -e "s; /usr/lib/; /usr/local/poky/eabi-glibc/arm/arm-poky-linux-gnueabi/usr/lib/;g" $f
+  done
+  popd;
+fi
+
+
 opt_run_make $clean     $package $version "clean"
 opt_run_make $distclean $package $version "distclean"

gs2-extensions/music-stand/trunk/runtime-srcpack/packages/CASCADE-MAKE/LIB-POPPLER.sh

@@ -13 +13 @@
 export LDFLAGS="-L$prefix/lib"
 
+if [ ! -z $CROSSCOMPILE ] ; then
+  export LIBTOOL=arm-poky-linux-gnueabi-libtool
+  export PATH=$PATH:$prefix/devel/bin
+
+##  export LDFLAGS="$LDFLAGS -L/usr/local/poky/eabi-glibc/arm/arm-poky-linux-gnueabi/usr/lib/"
+fi
 
 opt_run_untar $force_untar $auto_untar $package $version
@@ -19 +25 @@
 opt_run_make $compile   $package $version
 opt_run_make $install   $package $version "install"
+
+if [ $install = "1" ] ; then
+  pushd $prefix/lib ; 
+  for f in libpoppler-glib.la libpoppler.la ; do
+    sed -i~ -e "s; /usr/lib/; /usr/local/poky/eabi-glibc/arm/arm-poky-linux-gnueabi/usr/lib/;g" $f
+  done
+  popd;
+fi
+
 opt_run_make $clean     $package $version "clean"
 opt_run_make $distclean $package $version "distclean"