[oe-commits] org.oe.dev merge of '12eb583922c7b7778b159e3f0c2005fd35eeecf2'
xora commit
oe at amethyst.openembedded.net
Thu Mar 20 12:23:42 UTC 2008
merge of '12eb583922c7b7778b159e3f0c2005fd35eeecf2'
and '546fe3a8a6dffbbc40966ee0e8b1ea0c9ba2e9f2'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 776dc04c7eba19512692b4d40a123d45e6adb862
ViewMTN: http://monotone.openembedded.org/revision/info/776dc04c7eba19512692b4d40a123d45e6adb862
Files:
1
packages/gstreamer/gstreamer/po-makefile-fix.patch
packages/gstreamer/gstreamer_0.10.17.bb
classes/autotools.bbclass
classes/native.bbclass
classes/package.bbclass
packages/db/db-native_4.2.52.bb
packages/db/db_4.2.52.bb
Diffs:
#
# mt diff -r12eb583922c7b7778b159e3f0c2005fd35eeecf2 -r776dc04c7eba19512692b4d40a123d45e6adb862
#
#
#
# add_file "packages/gstreamer/gstreamer/po-makefile-fix.patch"
# content [f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d]
#
# patch "packages/gstreamer/gstreamer_0.10.17.bb"
# from [5ed31adc22e5c777ea6a206f57d4e85992cd22b8]
# to [ec06bc77d66c0e2f9c6286fa2dafe211dfacb017]
#
============================================================
--- packages/gstreamer/gstreamer/po-makefile-fix.patch f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d
+++ packages/gstreamer/gstreamer/po-makefile-fix.patch f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d
@@ -0,0 +1,13 @@
+Index: gstreamer-0.10.17/po/Makefile.in.in
+===================================================================
+--- gstreamer-0.10.17.orig/po/Makefile.in.in 2008-01-25 23:21:31.000000000 +0800
++++ gstreamer-0.10.17/po/Makefile.in.in 2008-03-20 19:10:54.000000000 +0800
+@@ -30,7 +30,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(MKINSTALLDIRS)
+
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
============================================================
--- packages/gstreamer/gstreamer_0.10.17.bb 5ed31adc22e5c777ea6a206f57d4e85992cd22b8
+++ packages/gstreamer/gstreamer_0.10.17.bb ec06bc77d66c0e2f9c6286fa2dafe211dfacb017
@@ -1,3 +1,6 @@ require gstreamer.inc
require gstreamer.inc
+PR = "r1"
+
+SRC_URI += "file://po-makefile-fix.patch;patch=1"
+
-PR = "r0"
#
# mt diff -r546fe3a8a6dffbbc40966ee0e8b1ea0c9ba2e9f2 -r776dc04c7eba19512692b4d40a123d45e6adb862
#
#
#
# patch "classes/autotools.bbclass"
# from [d5a547cefa5e9958965f5dda7aac45f65e89d575]
# to [a03edf4667fb88b98d0f6ea62adcf75168d43bea]
#
# patch "classes/native.bbclass"
# from [ff9a8ed86294577afe2ec629e61b3d86ca2eec27]
# to [49b3ea484f76f2d16525a51fd376aab503da1e3b]
#
# patch "classes/package.bbclass"
# from [e1d1b0d0d549915c2162821bd76d7e95f0baea5d]
# to [906d70a366b88e9727bc076e7246c6de0874bc0f]
#
# patch "packages/db/db-native_4.2.52.bb"
# from [c4ce70294440faef5d079ed377f430f75f90eab9]
# to [5c0fba9adce096fef14fb5d04f1d361ca27d602e]
#
# patch "packages/db/db_4.2.52.bb"
# from [41208c76d958528130660c526e5ef5b56e8181de]
# to [1a8760b7fc8cc0392968b1042a6f1f4ad8942c90]
#
============================================================
--- classes/autotools.bbclass d5a547cefa5e9958965f5dda7aac45f65e89d575
+++ classes/autotools.bbclass a03edf4667fb88b98d0f6ea62adcf75168d43bea
@@ -165,6 +165,17 @@ autotools_stage_includes() {
fi
}
+autotools_stage_dir() {
+ from="$1"
+ to="$2"
+ # This will remove empty directories so we can ignore them
+ rmdir "$from" 2> /dev/null || true
+ if [ -d "$from" ]; then
+ mkdir -p "$to"
+ cp -fpPR -t "$to" "$from"/*
+ fi
+}
+
autotools_stage_all() {
if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
then
@@ -173,9 +184,13 @@ autotools_stage_all() {
rm -rf ${STAGE_TEMP}
mkdir -p ${STAGE_TEMP}
oe_runmake DESTDIR="${STAGE_TEMP}" install
- if [ -d ${STAGE_TEMP}/${includedir} ]; then
- mkdir -p ${STAGING_INCDIR}
- cp -fpPR -t ${STAGING_INCDIR} ${STAGE_TEMP}/${includedir}/*
+ autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR}
+ if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then
+ autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir}
+ autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir}
+ autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir}
+ autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir}
+ autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir}
fi
if [ -d ${STAGE_TEMP}/${libdir} ]
then
@@ -200,41 +215,9 @@ autotools_stage_all() {
cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
fi
fi
-
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${datadir} || true
- if [ -d ${STAGE_TEMP}/${datadir} ]; then
- install -d ${STAGING_DATADIR}/
- cp -fpPR ${STAGE_TEMP}/${datadir}/* ${STAGING_DATADIR}/
- fi
-
- if [ "${AUTOTOOLS_NATIVE_STAGE_BINARIES}" = "1" ] ; then
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${bindir} || true
- if [ -d ${STAGE_TEMP}/${bindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_bindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_bindir} ${STAGE_TEMP}/${bindir}/*
- fi
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${sbindir} || true
- if [ -d ${STAGE_TEMP}/${sbindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_sbindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_sbindir} ${STAGE_TEMP}/${sbindir}/*
- fi
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${base_bindir} || true
- if [ -d ${STAGE_TEMP}/${base_bindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_base_bindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_base_bindir} ${STAGE_TEMP}/${base_bindir}/*
- fi
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${base_sbindir} || true
- if [ -d ${STAGE_TEMP}/${base_sbindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_base_sbindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_nase_sbindir} ${STAGE_TEMP}/${base_sbindir}/*
- fi
-
- fi
+ rm -rf ${STAGE_TEMP}/${mandir} || true
+ rm -rf ${STAGE_TEMP}/${infodir} || true
+ autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR}
rm -rf ${STAGE_TEMP}
}
============================================================
--- classes/native.bbclass ff9a8ed86294577afe2ec629e61b3d86ca2eec27
+++ classes/native.bbclass 49b3ea484f76f2d16525a51fd376aab503da1e3b
@@ -80,7 +80,6 @@ do_stage () {
then
oe_runmake install
else
- export AUTOTOOLS_NATIVE_STAGE_BINARIES="1"
autotools_stage_all
fi
fi
============================================================
--- classes/package.bbclass e1d1b0d0d549915c2162821bd76d7e95f0baea5d
+++ classes/package.bbclass 906d70a366b88e9727bc076e7246c6de0874bc0f
@@ -490,6 +490,8 @@ python emit_pkgdata() {
for pkg in packages.split():
subdata_file = pkgdatadir + "/runtime/%s" % pkg
sf = open(subdata_file, 'w')
+ write_if_exists(sf, pkg, 'PN')
+ write_if_exists(sf, pkg, 'PR')
write_if_exists(sf, pkg, 'DESCRIPTION')
write_if_exists(sf, pkg, 'RDEPENDS')
write_if_exists(sf, pkg, 'RPROVIDES')
@@ -497,7 +499,6 @@ python emit_pkgdata() {
write_if_exists(sf, pkg, 'RSUGGESTS')
write_if_exists(sf, pkg, 'RREPLACES')
write_if_exists(sf, pkg, 'RCONFLICTS')
- write_if_exists(sf, pkg, 'PR')
write_if_exists(sf, pkg, 'PKG')
write_if_exists(sf, pkg, 'ALLOW_EMPTY')
write_if_exists(sf, pkg, 'FILES')
============================================================
--- packages/db/db-native_4.2.52.bb c4ce70294440faef5d079ed377f430f75f90eab9
+++ packages/db/db-native_4.2.52.bb 5c0fba9adce096fef14fb5d04f1d361ca27d602e
@@ -11,3 +11,17 @@ PACKAGES = ""
require db_${PV}.bb
PACKAGES = ""
+
+do_stage() {
+ # The .h files get installed read-only, the autostage
+ # function just uses cp -pPR, so do this by hand
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake DESTDIR="${STAGE_TEMP}" install_include
+ cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
+ rm -rf ${STAGE_TEMP}
+ oe_libinstall -so -C .libs libdb-4.2 ${STAGING_LIBDIR}
+ ln -sf libdb-4.2.so ${STAGING_LIBDIR}/libdb.so
+ ln -sf libdb-4.2.a ${STAGING_LIBDIR}/libdb.a
+}
+
============================================================
--- packages/db/db_4.2.52.bb 41208c76d958528130660c526e5ef5b56e8181de
+++ packages/db/db_4.2.52.bb 1a8760b7fc8cc0392968b1042a6f1f4ad8942c90
@@ -14,7 +14,7 @@ CONFLICTS = "db3"
LICENSE = "BSD Sleepycat"
VIRTUAL_NAME ?= "virtual/db"
CONFLICTS = "db3"
-PR = "r6"
+PR = "r7"
SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
More information about the Openembedded-commits
mailing list