summaryrefslogtreecommitdiff
path: root/packages/xorg-lib
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-05-18 17:42:25 +0000
committerKoen Kooi <koen@openembedded.org>2007-05-18 17:42:25 +0000
commit84fb17dfe2e9fe8db3efc916cf48456f5d94e2b5 (patch)
treeff76a8e82ab341297c4e2c254ee2271f06014740 /packages/xorg-lib
parent22f892b9896817c428a53a612d4389a38e39cfa9 (diff)
libx11: add a new -native and stop removing xlib.h
Diffstat (limited to 'packages/xorg-lib')
-rw-r--r--packages/xorg-lib/libx11-native_1.1.1.bb26
-rw-r--r--packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb1
-rw-r--r--packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb1
-rw-r--r--packages/xorg-lib/libx11_1.1.1.bb1
-rw-r--r--packages/xorg-lib/libx11_X11R7.0-1.0.0.bb1
-rw-r--r--packages/xorg-lib/libx11_X11R7.1-1.0.1.bb1
-rw-r--r--packages/xorg-lib/libx11_git.bb1
7 files changed, 26 insertions, 6 deletions
diff --git a/packages/xorg-lib/libx11-native_1.1.1.bb b/packages/xorg-lib/libx11-native_1.1.1.bb
new file mode 100644
index 0000000000..003c3580c8
--- /dev/null
+++ b/packages/xorg-lib/libx11-native_1.1.1.bb
@@ -0,0 +1,26 @@
+require xorg-lib-common.inc
+PE = "1"
+PR = "r0"
+
+DESCRIPTION = "Base X libs."
+
+DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
+ libxcb libxdmcp xf86bigfontproto kbproto inputproto"
+PROVIDES = "virtual/libx11"
+RPROVIDES = "virtual/libx11"
+
+XORG_PN = "libX11"
+
+PACKAGES =+ "libx11-xcb"
+
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
+FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*"
+
+do_compile() {
+ (
+ unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
+ ) || exit 1
+ oe_runmake
+}
diff --git a/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
index 2023b5741d..f1dfd65c98 100644
--- a/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libx11-native_X11R7.0-1.0.0.bb
@@ -20,6 +20,5 @@ do_compile() {
unset CC LD CXX CCLD
oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
)
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
oe_runmake
}
diff --git a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
index 2b84b2c53c..b9bbbd8120 100644
--- a/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11-native_X11R7.1-1.0.1.bb
@@ -20,6 +20,5 @@ do_compile() {
unset CC LD CXX CCLD
oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
)
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
oe_runmake
}
diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb
index 45f524df58..d661ca91c6 100644
--- a/packages/xorg-lib/libx11_1.1.1.bb
+++ b/packages/xorg-lib/libx11_1.1.1.bb
@@ -22,6 +22,5 @@ do_compile() {
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
) || exit 1
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
oe_runmake
}
diff --git a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
index c01fa729fb..b1c26775e3 100644
--- a/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
+++ b/packages/xorg-lib/libx11_X11R7.0-1.0.0.bb
@@ -17,6 +17,5 @@ do_compile() {
unset CC LD CXX CCLD
oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
) || exit 1
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
oe_runmake
}
diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
index c6a701d9cb..45dc334c92 100644
--- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
+++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb
@@ -20,6 +20,5 @@ do_compile() {
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys
) || exit 1
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
oe_runmake
}
diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb
index 3f7fd5853e..5a333914e2 100644
--- a/packages/xorg-lib/libx11_git.bb
+++ b/packages/xorg-lib/libx11_git.bb
@@ -24,7 +24,6 @@ do_compile() {
unset CC LD CXX CCLD
oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys
)
- rm -f ${STAGING_INCDIR}/X11/Xlib.h
oe_runmake
}