* [Buildroot] svn commit: trunk/buildroot/package/tinyx
@ 2006-07-26 12:11 andersen
2006-07-27 4:58 ` Johannes Winkelmann
0 siblings, 1 reply; 8+ messages in thread
From: andersen @ 2006-07-26 12:11 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-07-26 12:11:36 -0700 (Wed, 26 Jul 2006)
New Revision: 15747
Log:
patch from Biucchi Gabriele:
Some programs (like rxvt) need x-includes and x-libraries in
$(STAGING_DIR)/usr/X11R6/ , but tinyx.mk does not install anything there.
copy everything from $(TINYX_DIR)/exports/ into $(STAGING_DIR)/usr/X11R6/
Modified:
trunk/buildroot/package/tinyx/tinyx.mk
Changeset:
Modified: trunk/buildroot/package/tinyx/tinyx.mk
===================================================================
--- trunk/buildroot/package/tinyx/tinyx.mk 2006-07-26 17:25:08 UTC (rev 15746)
+++ trunk/buildroot/package/tinyx/tinyx.mk 2006-07-26 19:11:36 UTC (rev 15747)
@@ -100,8 +100,17 @@
( cd $(TINYX_DIR) ; $(MAKE) World )
#
+# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
+# and add a symbolic link between /usr/bin/X11 and /usr/X11R6/bin
+$(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV)
+ mkdir -p $(STAGING_DIR)/usr/X11R6/lib
+ mkdir -p $(STAGING_DIR)/usr/X11R6/include
+ cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/
+ cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/
+ ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11
+
+#
# Once Frame Buffer is built, we install executables.
-#
$(TINYX_BINX)/Xfbdev: $(TINYX_XFBDEV)
-mkdir $(TARGET_DIR)/usr/X11R6
-mkdir $(TINYX_BINX)
@@ -116,7 +125,6 @@
#
# After we have executables installed, install the libraries.
-#
$(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV)
for dirs in $(TINYX_LIBS) ; do \
file=`find $(TINYX_LDIR)/$$dirs -type f -iname "lib$$dirs.so*"` ; \
@@ -126,7 +134,8 @@
cp -pRf $$file $(TINYX_LIBX) ; \
done
-tinyx: zlib $(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev
+tinyx: zlib $(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2 \
+ $(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev
tinyx-source: $(DL_DIR)/$(TINYX_SOURCE)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/tinyx
2006-07-26 12:11 andersen
@ 2006-07-27 4:58 ` Johannes Winkelmann
2006-07-27 11:30 ` Erik Andersen
0 siblings, 1 reply; 8+ messages in thread
From: Johannes Winkelmann @ 2006-07-27 4:58 UTC (permalink / raw)
To: buildroot
Hi,
This commit breaks compilation of tinyx due to using spaces for
indentation; fix attached.
andersen@uclibc.org wrote:
> Author: andersen
> Date: 2006-07-26 12:11:36 -0700 (Wed, 26 Jul 2006)
> New Revision: 15747
[...]
> Changeset:
> Modified: trunk/buildroot/package/tinyx/tinyx.mk
> ===================================================================
> --- trunk/buildroot/package/tinyx/tinyx.mk 2006-07-26 17:25:08 UTC (rev 15746)
> +++ trunk/buildroot/package/tinyx/tinyx.mk 2006-07-26 19:11:36 UTC (rev 15747)
> @@ -100,8 +100,17 @@
> ( cd $(TINYX_DIR) ; $(MAKE) World )
>
> #
> +# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
> +# and add a symbolic link between /usr/bin/X11 and /usr/X11R6/bin
> +$(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV)
> + mkdir -p $(STAGING_DIR)/usr/X11R6/lib
> + mkdir -p $(STAGING_DIR)/usr/X11R6/include
> + cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/
> + cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/
> + ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11
^^^^^^^
Best regards, Johannes
--
Johannes Winkelmann
http://www.ife.ee.ethz.ch
-------------- next part --------------
Index: package/tinyx/tinyx.mk
===================================================================
--- package/tinyx/tinyx.mk (revision 15749)
+++ package/tinyx/tinyx.mk (working copy)
@@ -103,11 +103,11 @@
# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
# and add a symbolic link between /usr/bin/X11 and /usr/X11R6/bin
$(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV)
- mkdir -p $(STAGING_DIR)/usr/X11R6/lib
- mkdir -p $(STAGING_DIR)/usr/X11R6/include
- cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/
- cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/
- ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11
+ mkdir -p $(STAGING_DIR)/usr/X11R6/lib
+ mkdir -p $(STAGING_DIR)/usr/X11R6/include
+ cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/
+ cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/
+ ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11
#
# Once Frame Buffer is built, we install executables.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/tinyx
@ 2006-07-27 11:30 andersen
0 siblings, 0 replies; 8+ messages in thread
From: andersen @ 2006-07-27 11:30 UTC (permalink / raw)
To: buildroot
Author: andersen
Date: 2006-07-27 11:30:24 -0700 (Thu, 27 Jul 2006)
New Revision: 15755
Log:
Stupid make needs tabs. Fix broken whitespace
Modified:
trunk/buildroot/package/tinyx/tinyx.mk
Changeset:
Modified: trunk/buildroot/package/tinyx/tinyx.mk
===================================================================
--- trunk/buildroot/package/tinyx/tinyx.mk 2006-07-27 16:40:55 UTC (rev 15754)
+++ trunk/buildroot/package/tinyx/tinyx.mk 2006-07-27 18:30:24 UTC (rev 15755)
@@ -103,11 +103,11 @@
# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
# and add a symbolic link between /usr/bin/X11 and /usr/X11R6/bin
$(STAGING_DIR)/usr/X11R6/lib/libX11.so.6.2: $(TINYX_XFBDEV)
- mkdir -p $(STAGING_DIR)/usr/X11R6/lib
- mkdir -p $(STAGING_DIR)/usr/X11R6/include
- cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/
- cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/
- ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11
+ mkdir -p $(STAGING_DIR)/usr/X11R6/lib
+ mkdir -p $(STAGING_DIR)/usr/X11R6/include
+ cp -fRL $(TINYX_DIR)/exports/include/* $(STAGING_DIR)/usr/X11R6/include/
+ cp -fRL $(TINYX_DIR)/exports/lib/* $(STAGING_DIR)/usr/X11R6/lib/
+ ln -s /usr/X11R6/bin $(TARGET_DIR)/usr/bin/X11
#
# Once Frame Buffer is built, we install executables.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/tinyx
2006-07-27 4:58 ` Johannes Winkelmann
@ 2006-07-27 11:30 ` Erik Andersen
0 siblings, 0 replies; 8+ messages in thread
From: Erik Andersen @ 2006-07-27 11:30 UTC (permalink / raw)
To: buildroot
On Thu Jul 27, 2006 at 12:54:28PM +0200, Johannes Winkelmann wrote:
> Hi,
>
> This commit breaks compilation of tinyx due to using spaces for
> indentation; fix attached.
Oops, yeah. I had fixed that locally but forgot to commit
the change.
-Erik
--
Erik B. Andersen http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/tinyx
@ 2007-07-31 18:31 ulf at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-07-31 18:31 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-07-31 11:31:58 -0700 (Tue, 31 Jul 2007)
New Revision: 19364
Log:
Use TARGET_CONFIGURE_OPTS in tinyX
Modified:
trunk/buildroot/package/tinyx/tinyx.mk
Changeset:
Modified: trunk/buildroot/package/tinyx/tinyx.mk
===================================================================
--- trunk/buildroot/package/tinyx/tinyx.mk 2007-07-31 18:25:29 UTC (rev 19363)
+++ trunk/buildroot/package/tinyx/tinyx.mk 2007-07-31 18:31:58 UTC (rev 19364)
@@ -97,7 +97,7 @@
#echo "RANLIB=$(TARGET_CROSS)ranlib" >> $(TINYX_DIR)/Makefile
#echo "OBJCOPY=$(TARGET_CROSS)objcopy" >> $(TINYX_DIR)/Makefile
#cat $(TINYX_DIR)/Makefile.xxxx >> $(TINYX_DIR)/Makefile
- ( cd $(TINYX_DIR) ; $(MAKE) World )
+ ( cd $(TINYX_DIR) ; $(MAKE) $(TARGET_CONFIGURE_OPTS) World )
#
# Install x-includes and x-libraries in $(STAGING_DIR)/usr/X11R6/
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/tinyx
@ 2007-08-13 20:07 ulf at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-08-13 20:07 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-13 13:07:31 -0700 (Mon, 13 Aug 2007)
New Revision: 19491
Log:
Allow use of uclibc string routines in TinyX
Added:
trunk/buildroot/package/tinyx/tinyx-011010-strings.patch
Changeset:
Added: trunk/buildroot/package/tinyx/tinyx-011010-strings.patch
===================================================================
--- trunk/buildroot/package/tinyx/tinyx-011010-strings.patch (rev 0)
+++ trunk/buildroot/package/tinyx/tinyx-011010-strings.patch 2007-08-13 20:07:31 UTC (rev 19491)
@@ -0,0 +1,13 @@
+diff -urN xc-011010-0rig/include/Xfuncs.h xc-011010/include/Xfuncs.h
+--- xc-011010-0rig/include/Xfuncs.h 2001-07-25 17:04:42.000000000 +0200
++++ xc-011010/include/Xfuncs.h 2007-08-13 13:08:39.000000000 +0200
+@@ -45,6 +45,9 @@
+ #include <strings.h>
+ /* bcopy, bcmp, bzero declared */
+ #define _XFUNCS_H_INCLUDED_STRING_H
++#elif defined(__UCLIBC__)
++#include <string.h>
++#define _XFUNCS_H_INCLUDED_STRING_H
+ #else
+ #include <string.h>
+ #define _XFUNCS_H_INCLUDED_STRING_H
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/tinyx
@ 2007-08-13 20:10 ulf at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-08-13 20:10 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-13 13:10:36 -0700 (Mon, 13 Aug 2007)
New Revision: 19492
Log:
Include header file defining MB_CUR_MAX to TinyX
Added:
trunk/buildroot/package/tinyx/tinyx-011010-MB_CUR_MAX.patch
Changeset:
Added: trunk/buildroot/package/tinyx/tinyx-011010-MB_CUR_MAX.patch
===================================================================
--- trunk/buildroot/package/tinyx/tinyx-011010-MB_CUR_MAX.patch (rev 0)
+++ trunk/buildroot/package/tinyx/tinyx-011010-MB_CUR_MAX.patch 2007-08-13 20:10:36 UTC (rev 19492)
@@ -0,0 +1,11 @@
+diff -urN xc-011010-0rig/lib/X11/lcGenConv.c xc-011010/lib/X11/lcGenConv.c
+--- xc-011010-0rig/lib/X11/lcGenConv.c 2001-08-15 13:54:21.000000000 +0200
++++ xc-011010/lib/X11/lcGenConv.c 2007-08-13 12:55:18.000000000 +0200
+@@ -48,6 +48,7 @@
+ * Platforms: all systems.
+ */
+
++#include <stdlib.h>
+ #include "Xlibint.h"
+ #include "XlcGeneric.h"
+ #include <stdio.h>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/package/tinyx
@ 2007-08-13 21:30 ulf at uclibc.org
0 siblings, 0 replies; 8+ messages in thread
From: ulf at uclibc.org @ 2007-08-13 21:30 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2007-08-13 14:30:02 -0700 (Mon, 13 Aug 2007)
New Revision: 19496
Log:
Avoid circular dependency
Modified:
trunk/buildroot/package/tinyx/Config.in
Changeset:
Modified: trunk/buildroot/package/tinyx/Config.in
===================================================================
--- trunk/buildroot/package/tinyx/Config.in 2007-08-13 20:49:58 UTC (rev 19495)
+++ trunk/buildroot/package/tinyx/Config.in 2007-08-13 21:30:02 UTC (rev 19496)
@@ -1,8 +1,8 @@
config BR2_PACKAGE_TINYX
bool "tinyx"
default y if BR2_PACKAGE_XSERVER_tinyx
- depends on BR2_USE_WCHAR
- depends on BR2_ENABLE_LOCALE
+ select BR2_USE_WCHAR
+ select BR2_ENABLE_LOCALE
help
A tiny X server. Also known as 'Xfbdev' and 'kdrive'.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2007-08-13 21:30 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-13 20:07 [Buildroot] svn commit: trunk/buildroot/package/tinyx ulf at uclibc.org
-- strict thread matches above, loose matches on Subject: below --
2007-08-13 21:30 ulf at uclibc.org
2007-08-13 20:10 ulf at uclibc.org
2007-07-31 18:31 ulf at uclibc.org
2006-07-27 11:30 andersen
2006-07-26 12:11 andersen
2006-07-27 4:58 ` Johannes Winkelmann
2006-07-27 11:30 ` Erik Andersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox