summaryrefslogtreecommitdiff
path: root/packages/xfonts
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-12 20:40:10 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-12 20:40:10 +0000
commit76b46a7fc3c1c66dd8b6cd6769a6ec501523c758 (patch)
tree35746103d3ee5ae20352825f5fa19afaa4ac80a3 /packages/xfonts
parent4da43e3f832083557df09175e7a4ecdc15299e78 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/12 21:37:08+01:00 reciva.com!pb fix up xfonts-xorg build breakage BKrev: 42ac9daaq5u71ldrgR9ZDKoi7Km1tw
Diffstat (limited to 'packages/xfonts')
-rw-r--r--packages/xfonts/lexer.patch0
-rw-r--r--packages/xfonts/xfonts-xorg_6.8.bb15
2 files changed, 9 insertions, 6 deletions
diff --git a/packages/xfonts/lexer.patch b/packages/xfonts/lexer.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xfonts/lexer.patch
diff --git a/packages/xfonts/xfonts-xorg_6.8.bb b/packages/xfonts/xfonts-xorg_6.8.bb
index 6395765cb3..5bb1f522bb 100644
--- a/packages/xfonts/xfonts-xorg_6.8.bb
+++ b/packages/xfonts/xfonts-xorg_6.8.bb
@@ -4,7 +4,7 @@ PR = "r1"
LICENSE = "XFree86"
SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;tag=XORG-6_8_0;method=pserver \
- file://imake-staging.patch;patch=1"
+ file://lexer.patch;patch=1"
PACKAGES = "${PN}-75dpi ${PN}-100dpi ${PN}-type1 ${PN}-cyrillic ${PN}-ttf ${PN}"
@@ -23,19 +23,22 @@ do_configure() {
echo "#define ProjectRoot /usr" >> config/cf/host.def
echo "#define XnestServer NO" >> config/cf/host.def
echo "#define XdmxServer NO" >> config/cf/host.def
- echo "#define CcCmd ${CC}" >> config/cf/host.def
- echo "#define LdCmd ${LD}" >> config/cf/host.def
+ echo "#define CcCmd ${BUILD_CC}" >> config/cf/host.def
+ echo "#define LdCmd ${BUILD_LD}" >> config/cf/host.def
+ echo "#define BuildFreetype2Library YES" >> config/cf/host.def
+ echo "#define HasFreetype2 NO" >> config/cf/host.def
echo "" > config/cf/date.def
-}
-
-do_compile() {
make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
make CC="${BUILD_CC}" xmakefile
make Makefiles
make clean
+}
+
+do_compile() {
#make depend
make includes
make -C config/util
+ make -C lib/freetype2
make -C lib/font
make -C lib/fontenc
make -C lib/fontconfig