From: andersen at uclibc.org <andersen@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/xorg
Date: Wed, 10 Jan 2007 22:17:05 -0800 (PST) [thread overview]
Message-ID: <20070111061705.CE89B4857B@busybox.net> (raw)
Author: andersen
Date: 2007-01-10 22:17:04 -0800 (Wed, 10 Jan 2007)
New Revision: 17238
Log:
more updates to ensure subsequent packages build
Modified:
trunk/buildroot/package/xorg/Config.in
trunk/buildroot/package/xorg/xorg-config.patch
trunk/buildroot/package/xorg/xorg.mk
Changeset:
Modified: trunk/buildroot/package/xorg/Config.in
===================================================================
--- trunk/buildroot/package/xorg/Config.in 2007-01-10 23:57:40 UTC (rev 17237)
+++ trunk/buildroot/package/xorg/Config.in 2007-01-11 06:17:04 UTC (rev 17238)
@@ -5,6 +5,7 @@
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_FREETYPE
+ select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_PKGCONFIG
help
The official X Window system and server.
Modified: trunk/buildroot/package/xorg/xorg-config.patch
===================================================================
--- trunk/buildroot/package/xorg/xorg-config.patch 2007-01-10 23:57:40 UTC (rev 17237)
+++ trunk/buildroot/package/xorg/xorg-config.patch 2007-01-11 06:17:04 UTC (rev 17238)
@@ -1,6 +1,6 @@
--- xc/config/cf/host.def~ Thu May 12 15:28:01 MDT 2005
+++ xc/config/cf/host.def Thu May 12 15:28:01 MDT 2005
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,44 @@
+#define KDriveXServer YES
+#define TinyXServer YES
+#define XfbdevServer YES
@@ -12,13 +12,14 @@
+#define Freetype2Dir REPLACE_STAGING_DIR
+#define HasFontconfig NO
+#define HasLibpng YES
-+#define HasZlib YES
++#define HasZlib YES
+#define HaveLib64 NO
+#define LibDirName lib
+#define SystemUsrLibDir /usr/lib
+#define TkLibDir /usr/lib
+
-+#define HasExpat NO
++#define HasExpat YES
++#define ExpatDir REPLACE_STAGING_DIR
+#define XprtServer NO
+#define BuildXprintClients NO
+#define TouchScreen NO
Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk 2007-01-10 23:57:40 UTC (rev 17237)
+++ trunk/buildroot/package/xorg/xorg.mk 2007-01-11 06:17:04 UTC (rev 17238)
@@ -12,7 +12,7 @@
mkfontscale/mkfontscale mkfontdir/mkfontdir \
#xterm/xterm
-XORG_LIBS:= Xft fontconfig expat Xrender Xaw Xmu Xt \
+XORG_LIBS:= Xft fontconfig Xrender Xaw Xmu Xt \
SM ICE Xpm Xp Xext X11 Xmuu Xxf86misc
@@ -97,9 +97,8 @@
touch -c $(XORG_XSERVER)
$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
- -mkdir -p $(STAGING_DIR)$(TARGET_LIBX)
- rm -f $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig
- ln -fs ../../../lib/pkgconfig $(STAGING_DIR)$(TARGET_LIBX)/pkgconfig
+ -mkdir -p $(STAGING_DIR)/usr/X11R6
+ ln -fs ../../lib $(STAGING_DIR)$(TARGET_LIBX)
( cd $(XORG_DIR); $(MAKE) \
DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
$(SED) 's,/usr/X11R6,$(STAGING_DIR)/usr/X11R6,' $(STAGING_DIR)/usr/X11R6/lib/pkgconfig/*.pc
@@ -144,7 +143,8 @@
touch -c $(XORG_LIBX)/libX11.so.6.2
-xorg: zlib png pkgconfig freetype $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
+xorg: zlib png pkgconfig expat freetype \
+ $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2 $(XORG_LIBX)/libX11.so.6.2
xorg-source: $(DL_DIR)/$(XORG_SOURCE)
next reply other threads:[~2007-01-11 6:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-11 6:17 andersen at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-03-06 18:37 [Buildroot] svn commit: trunk/buildroot/package/xorg ninevoltz at uclibc.org
2007-08-15 9:46 ulf at uclibc.org
2007-05-22 11:17 jacmet at uclibc.org
2007-01-25 20:34 andersen at uclibc.org
2007-01-15 22:33 andersen at uclibc.org
2007-01-11 10:38 andersen at uclibc.org
2007-01-10 23:56 andersen at uclibc.org
2006-11-17 23:17 andersen at uclibc.org
2006-10-14 11:34 jacmet at uclibc.org
2006-10-02 18:25 andersen at uclibc.org
2006-09-27 18:17 jacmet at uclibc.org
2006-09-26 12:48 jacmet at uclibc.org
2006-07-20 20:29 andersen
2006-07-20 15:46 andersen
2006-07-18 2:00 andersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070111061705.CE89B4857B@busybox.net \
--to=andersen@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox