summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-11 17:40:08 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-11 17:40:08 +0000
commit3a0721b7496c2a4c28e116d2fd92545a42b2dcb7 (patch)
tree446b4502430ec1d5f7f43498c65073925511f915 /packages
parent34f88485c0509816ebe03c76801f43921759169e (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/11 17:41:56+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/06/11 17:39:21+01:00 reciva.com!pb more xorg build fixes BKrev: 42ab21f80EndbYfF86Ct6WUxwFOhCA
Diffstat (limited to 'packages')
-rw-r--r--packages/xserver/xserver-xorg_6.8.99.5.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/xserver/xserver-xorg_6.8.99.5.bb b/packages/xserver/xserver-xorg_6.8.99.5.bb
index 034103af06..5dbdbe8e05 100644
--- a/packages/xserver/xserver-xorg_6.8.99.5.bb
+++ b/packages/xserver/xserver-xorg_6.8.99.5.bb
@@ -28,7 +28,7 @@ do_configure() {
echo "#define XnestServer NO" >> config/cf/host.def
echo "#define XdmxServer NO" >> config/cf/host.def
echo "#define CcCmd gcc" >> config/cf/host.def
- echo "#define LdCmd gcc" >> config/cf/host.def
+ echo "#define LdCmd ld" >> config/cf/host.def
echo "#define HasFreetype2 YES" >> config/cf/host.def
echo "#define HasFontconfig YES" >> config/cf/host.def
echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def
@@ -45,7 +45,7 @@ do_compile() {
make includes
make -C config/util CC="${BUILD_CC}"
for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
- make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS=""
+ make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" CPP="${CC} -E"
}
do_install() {