summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-03-01 18:55:50 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-03-01 18:55:50 +0000
commit4e4f9126035a265bb4f43da55cf6be07cd60f181 (patch)
treef45f9b67469bafa6dcb62fdfaf462e85cedcfa34
parente363c9da4901be4da35424e6a7a29eb65490a9be (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/28 19:35:49+00:00 reciva.com!pb update libdisplaymigration to 0.99 2005/02/28 19:33:15+00:00 reciva.com!pb avoid crash when old shlibs dir does not exist 2005/03/01 01:51:41+00:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mebius.reciva.com:/home/pb/oe/oe 2005/03/01 01:50:40+00:00 reciva.com!pb undelete not-redundant-after-all autofoo x11 patch BKrev: 4224bab6qEo9lRsAKfk1n1wgknwp-w
-rw-r--r--classes/package.bbclass2
-rw-r--r--packages/libdisplaymigration/libdisplaymigration_0.99.bb0
-rw-r--r--packages/x11/files/autofoo.patch22
3 files changed, 24 insertions, 0 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 4ca34a3d05..e7cf98edd8 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -486,6 +486,8 @@ python package_do_pkgconfig () {
f.close()
for dir in [old_shlibs_dir, shlibs_dir]:
+ if not os.path.exists(dir):
+ continue
for file in os.listdir(dir):
m = re.match('^(.*)\.pclist$', file)
if m:
diff --git a/packages/libdisplaymigration/libdisplaymigration_0.99.bb b/packages/libdisplaymigration/libdisplaymigration_0.99.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libdisplaymigration/libdisplaymigration_0.99.bb
diff --git a/packages/x11/files/autofoo.patch b/packages/x11/files/autofoo.patch
new file mode 100644
index 0000000000..8bdba09768
--- /dev/null
+++ b/packages/x11/files/autofoo.patch
@@ -0,0 +1,22 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- libX11-6.2.1/configure.ac~autofoo
++++ libX11-6.2.1/configure.ac
+@@ -7,12 +7,12 @@
+ [jg@freedesktop.org],
+ libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_INIT_AUTOMAKE([dist-bzip2])
++AC_CONFIG_AUX_DIR(.)
+
++AM_INIT_AUTOMAKE([dist-bzip2])
+ AM_MAINTAINER_MODE
+
+ AM_CONFIG_HEADER([src/config.h])
+-AC_CONFIG_AUX_DIR(.)
+
+ # Checks for programs.
+ AC_PROG_LIBTOOL