r4430 - in trunk/src/host/toolchain-scripts: . bin scripts

[john_lee at docs.openmoko.org]

Author: john_lee
Date: 2008-05-14 06:31:26 +0200 (Wed, 14 May 2008)
New Revision: 4430

Modified:
   trunk/src/host/toolchain-scripts/bin/om-conf
   trunk/src/host/toolchain-scripts/scripts/script-env
   trunk/src/host/toolchain-scripts/setup-env
Log:
update to match the new sysroot structure in oe.


Modified: trunk/src/host/toolchain-scripts/bin/om-conf
===================================================================
--- trunk/src/host/toolchain-scripts/bin/om-conf	2008-05-14 03:24:24 UTC (rev 4429)
+++ trunk/src/host/toolchain-scripts/bin/om-conf	2008-05-14 04:31:26 UTC (rev 4430)
@@ -25,9 +25,6 @@
 # This script will call native autoconf tools.  if it's not installed
 # we're in trouble.
 
-# FIXME: sometimes requires glib native installed, which is not in the toolchain yet.
-# FIXME: sometimes requires intltool native installed, which is not in the toolchain yet.
-
 error_exit () {
 	echo usage: $(basename $0) [app_dir_name]
 	exit 1
@@ -93,6 +90,7 @@
 		    --oldincludedir=${oldincludedir} \
 		    --infodir=${infodir} \
 		    --mandir=${mandir} \
+                    --enable-mainainer-mode \
 			${EXTRA_OECONF} \
 		    $@"
 		oenote "Running $cfgcmd..."

Modified: trunk/src/host/toolchain-scripts/scripts/script-env
===================================================================
--- trunk/src/host/toolchain-scripts/scripts/script-env	2008-05-14 03:24:24 UTC (rev 4429)
+++ trunk/src/host/toolchain-scripts/scripts/script-env	2008-05-14 04:31:26 UTC (rev 4430)
@@ -1,7 +1,7 @@
 EXTRA_OECONF=
 EXTRA_AUTORECONF=
 EXTRA_OEMAKE=
-STAGING_DATADIR=${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/share/aclocal
+STAGING_DATADIR=${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/usr/share
 BUILD_SYS=$(uname -m)-$(uname -s | tr "A-Z" "a-z")
 HOST_SYS="arm-angstrom-linux-gnueabi"
 TARGET_SYS="arm-angstrom-linux-gnueabi"

Modified: trunk/src/host/toolchain-scripts/setup-env
===================================================================
--- trunk/src/host/toolchain-scripts/setup-env	2008-05-14 03:24:24 UTC (rev 4429)
+++ trunk/src/host/toolchain-scripts/setup-env	2008-05-14 04:31:26 UTC (rev 4430)
@@ -7,16 +7,19 @@
 export RANLIB="arm-angstrom-linux-gnueabi-ranlib"
 export CXX="ccache arm-angstrom-linux-gnueabi-g++ -march=armv4t -mtune=arm920t"
 export OBJCOPY="arm-angstrom-linux-gnueabi-objcopy"
-export PKG_CONFIG_DIR="${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/lib/pkgconfig"
-export PKG_CONFIG_PATH="${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/lib/pkgconfig"
+export PKG_CONFIG_PATH="${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/usr/lib/pkgconfig"
+export PKG_CONFIG_SYSROOT_DIR="${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi"
 export LDFLAGS="-L${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/lib -Wl,-rpath-link,${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/lib -Wl,-O1"
 export CCLD="ccache arm-angstrom-linux-gnueabi-gcc -march=armv4t -mtune=arm920t"
 export MAKE="make"
 export CFLAGS="-isystem${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-export PKG_CONFIG_DISABLE_UNINSTALLED="yes"
 export CXXFLAGS="-isystem${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -fpermissive -fvisibility-inlines-hidden"
 export F77="ccache arm-angstrom-linux-gnueabi-g77 -march=armv4t -mtune=arm920t"
 export AS="arm-angstrom-linux-gnueabi-as"
 export AR="arm-angstrom-linux-gnueabi-ar"
 export CPP="arm-angstrom-linux-gnueabi-gcc -E"
 export OBJDUMP="arm-angstrom-linux-gnueabi-objdump"
+
+export CONFIG_SITE="${OMTOOL_DIR}/arm/site-config"
+alias opkg='LD_LIBRARY_PATH=${OMTOOL_DIR}/arm/lib ${OMTOOL_DIR}/arm/bin/opkg-cl -f ${OMTOOL_DIR}/arm/etc/opkg-sdk.conf -o ${OMTOOL_DIR}/arm'
+alias opkg-target='LD_LIBRARY_PATH=${OMTOOL_DIR}/arm/lib ${OMTOOL_DIR}/arm/bin/opkg-cl -f ${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi/etc/opkg.conf -o ${OMTOOL_DIR}/arm/arm-angstrom-linux-gnueabi'