[oe-commits] org.oe.dev Fix glibc-stage.inc to copy the .a files to /usr/lib and not into /lib

khem commit oe at amethyst.openembedded.net
Wed May 28 01:02:17 UTC 2008


Fix glibc-stage.inc to copy the .a files to /usr/lib and not into /lib

Author: khem at openembedded.org
Branch: org.openembedded.dev
Revision: 1f54abc8214163bf4496d65953df0e7723c452c8
ViewMTN: http://monotone.openembedded.org/revision/info/1f54abc8214163bf4496d65953df0e7723c452c8
Files:
1
packages/glibc/glibc-stage.inc
packages/glibc/glibc_2.3.2+cvs20040726.bb
packages/glibc/glibc_2.3.2.bb
packages/glibc/glibc_2.3.3+cvs20041128.bb
packages/glibc/glibc_2.3.3+cvs20050221.bb
packages/glibc/glibc_2.3.3+cvs20050420.bb
packages/glibc/glibc_2.3.3.bb
packages/glibc/glibc_2.3.5+cvs20050627.bb
packages/glibc/glibc_2.3.6.bb
packages/glibc/glibc_2.4.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
Diffs:

#
# mt diff -r776ac285eff3b1ef2fc027e6f898a4130593e87e -r1f54abc8214163bf4496d65953df0e7723c452c8
#
#
#
# patch "packages/glibc/glibc-stage.inc"
#  from [c50ef9d6a30c9a54b38d3166f9c5c13a1535a9e6]
#    to [8abe1d7d9fd4c34d725a7f26db2110bb66ec3e16]
# 
# patch "packages/glibc/glibc_2.3.2+cvs20040726.bb"
#  from [2796a2ca3f43cc68cb8dcab23c538f9d43671bfc]
#    to [404482c52929e553a7a15846565bc091b1d68753]
# 
# patch "packages/glibc/glibc_2.3.2.bb"
#  from [6ce928a3a50aaa74484d58ca109097ecf56dfdf6]
#    to [701099f8bed64e115a7c65d5793815cc5735a03e]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20041128.bb"
#  from [c52302457e46cbf50f3c743a36911af5c5ef5249]
#    to [442eafe5a4253c431004ae074ed0cd0a0132026f]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050221.bb"
#  from [6fcb1be9e4e8d1a32a5f67f6c5d828934cc23bfa]
#    to [fbe60a439a7c8dc0f7e0cdc48dcabc2c51702773]
# 
# patch "packages/glibc/glibc_2.3.3+cvs20050420.bb"
#  from [f54bdcea04b98f19a0b0200969fc2346af827228]
#    to [942b81356c7cd4760f372d3c3ee6b61d7ac19ae4]
# 
# patch "packages/glibc/glibc_2.3.3.bb"
#  from [a2b16ae14389f9b1f928da2651ce17295e946eb8]
#    to [50eb95a536c6cfbafd5a139d93d9a0734134138a]
# 
# patch "packages/glibc/glibc_2.3.5+cvs20050627.bb"
#  from [e767bb71ec3f4cc71f4c93cb973621df12f2ffa8]
#    to [bce1535f4259550272ad642b0d4a72a904b48912]
# 
# patch "packages/glibc/glibc_2.3.6.bb"
#  from [3826e28e6ca2febf5082e9e7b8b5a369ff9d48f9]
#    to [a180c138b01077df8b234264ee6abd46cbf72314]
# 
# patch "packages/glibc/glibc_2.4.bb"
#  from [06f918a79a1f11a8d3ec0bb653752c014ce40e33]
#    to [9273687ef222d89e4f8176cc0d9dc125af750f44]
# 
# patch "packages/glibc/glibc_2.5.bb"
#  from [1e078613766f3dd8fc94f432bbe07c4e1f98e30f]
#    to [3c1686afff4b72f25b0ee4879fa7df5bed91c6b3]
# 
# patch "packages/glibc/glibc_2.6.1.bb"
#  from [157296447567bd27d06a4c65f01df9c9fb53b53d]
#    to [72600385ebf1d9237fed74e0bae761983d19afb1]
# 
# patch "packages/glibc/glibc_2.7.bb"
#  from [bb41e38f1cd4eaa7b688b45abf9e3ba2b19d20c8]
#    to [02c169c2754286db4f842bbe42a680e438defb73]
#
============================================================
--- packages/glibc/glibc-stage.inc	c50ef9d6a30c9a54b38d3166f9c5c13a1535a9e6
+++ packages/glibc/glibc-stage.inc	8abe1d7d9fd4c34d725a7f26db2110bb66ec3e16
@@ -16,8 +16,8 @@ do_stage() {
 		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_INCDIR}/rpcsvc/
 	done
 	for i in libc.a libc_pic.a libc_nonshared.a; do
-		install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_base_libdir}/ || die "failed to install $i"
+		install -m 0644 ${B}/$i ${STAGING_DIR_HOST}/${layout_libdir}/ || die "failed to install $i"
 	done
-	echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libpthread.so
-	echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_base_libdir}/libc.so
+	echo 'GROUP ( ${layout_base_libdir}/libpthread.so.0 ${layout_libdir}/libpthread_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_libdir}/libpthread.so
+	echo 'GROUP ( ${layout_base_libdir}/libc.so.6 ${layout_libdir}/libc_nonshared.a )' > ${STAGING_DIR_HOST}/${layout_libdir}/libc.so
 }
============================================================
--- packages/glibc/glibc_2.3.2+cvs20040726.bb	2796a2ca3f43cc68cb8dcab23c538f9d43671bfc
+++ packages/glibc/glibc_2.3.2+cvs20040726.bb	404482c52929e553a7a15846565bc091b1d68753
@@ -3,7 +3,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r25"
+PR = "r26"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.2.bb	6ce928a3a50aaa74484d58ca109097ecf56dfdf6
+++ packages/glibc/glibc_2.3.2.bb	701099f8bed64e115a7c65d5793815cc5735a03e
@@ -1,6 +1,6 @@ require glibc.inc
 require glibc.inc
 
-PR = "r14"
+PR = "r15"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20041128.bb	c52302457e46cbf50f3c743a36911af5c5ef5249
+++ packages/glibc/glibc_2.3.3+cvs20041128.bb	442eafe5a4253c431004ae074ed0cd0a0132026f
@@ -3,7 +3,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r10"
+PR = "r11"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050221.bb	6fcb1be9e4e8d1a32a5f67f6c5d828934cc23bfa
+++ packages/glibc/glibc_2.3.3+cvs20050221.bb	fbe60a439a7c8dc0f7e0cdc48dcabc2c51702773
@@ -3,7 +3,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r10"
+PR = "r11"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.3+cvs20050420.bb	f54bdcea04b98f19a0b0200969fc2346af827228
+++ packages/glibc/glibc_2.3.3+cvs20050420.bb	942b81356c7cd4760f372d3c3ee6b61d7ac19ae4
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 DEFAULT_PREFERENCE_sh3 = "-99"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r8"
+PR = "r9"
 
 GLIBC_ADDONS ?= "linuxthreads"
 
============================================================
--- packages/glibc/glibc_2.3.3.bb	a2b16ae14389f9b1f928da2651ce17295e946eb8
+++ packages/glibc/glibc_2.3.3.bb	50eb95a536c6cfbafd5a139d93d9a0734134138a
@@ -1,6 +1,6 @@ require glibc.inc
 require glibc.inc
 
-PR = "r11"
+PR = "r12"
 
 DEFAULT_PREFERENCE_sh3 = "-99"
 
============================================================
--- packages/glibc/glibc_2.3.5+cvs20050627.bb	e767bb71ec3f4cc71f4c93cb973621df12f2ffa8
+++ packages/glibc/glibc_2.3.5+cvs20050627.bb	bce1535f4259550272ad642b0d4a72a904b48912
@@ -2,7 +2,7 @@ SRCDATE = "20050627"
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/glibc-cvs-2.3.5"
 SRCDATE = "20050627"
-PR = "r17"
+PR = "r18"
 
 #Doesnt build for sh3
 DEFAULT_PREFERENCE_sh3="-1"
============================================================
--- packages/glibc/glibc_2.3.6.bb	3826e28e6ca2febf5082e9e7b8b5a369ff9d48f9
+++ packages/glibc/glibc_2.3.6.bb	a180c138b01077df8b234264ee6abd46cbf72314
@@ -1,5 +1,7 @@ require glibc.inc
 require glibc.inc
 
+PR = "r0"
+
 #FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
 
 GLIBC_ADDONS ?= "linuxthreads"
============================================================
--- packages/glibc/glibc_2.4.bb	06f918a79a1f11a8d3ec0bb653752c014ce40e33
+++ packages/glibc/glibc_2.4.bb	9273687ef222d89e4f8176cc0d9dc125af750f44
@@ -1,6 +1,6 @@ require glibc.inc
 require glibc.inc
 
-PR = "r15"
+PR = "r16"
 
 #add the hosts that are confirmed to be working to COMPATIBLE_HOSTi
 COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)'
============================================================
--- packages/glibc/glibc_2.5.bb	1e078613766f3dd8fc94f432bbe07c4e1f98e30f
+++ packages/glibc/glibc_2.5.bb	3c1686afff4b72f25b0ee4879fa7df5bed91c6b3
@@ -1,5 +1,5 @@ require glibc.inc
 require glibc.inc
-PR = "r12"
+PR = "r13"
 
 ARM_INSTRUCTION_SET = "arm"
 
============================================================
--- packages/glibc/glibc_2.6.1.bb	157296447567bd27d06a4c65f01df9c9fb53b53d
+++ packages/glibc/glibc_2.6.1.bb	72600385ebf1d9237fed74e0bae761983d19afb1
@@ -1,5 +1,5 @@ require glibc.inc
 require glibc.inc
-PR = "r5"
+PR = "r6"
 
 ARM_INSTRUCTION_SET = "arm"
 
============================================================
--- packages/glibc/glibc_2.7.bb	bb41e38f1cd4eaa7b688b45abf9e3ba2b19d20c8
+++ packages/glibc/glibc_2.7.bb	02c169c2754286db4f842bbe42a680e438defb73
@@ -5,7 +5,7 @@ RPROVIDES_${PN}-dev = "libc6-dev"
 PACKAGES_DYNAMIC = "libc6*"
 RPROVIDES_${PN}-dev = "libc6-dev"
 
-PR = "r2"
+PR = "r3"
 
 # the -isystem in bitbake.conf screws up glibc do_stage
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"






More information about the Openembedded-commits mailing list