t-head/meta-external-toolchain
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-external-toolchain synced 2026-09-04 06:54:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from kergoth/layer-updates

Browse Source 
Adjust for upstream layer updates
This commit is contained in:
Christopher Larson
2014-09-22 10:50:52 -07:00
parent 0cb45b27a0 6a9f8597dd
commit 41ace572ae
13 changed files with 0 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/recipes-bsp/hostap/hostap-utils_0.4.7.bbappend
View File

@@ -1,2 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}:"
SRC_URI += "file://ldflags.patch"

27
core/recipes-bsp/hostap/ldflags.patch
View File

@@ -1,27 +0,0 @@
---
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- hostap-utils-0.4.7.orig/Makefile
+++ hostap-utils-0.4.7/Makefile
@@ -14,17 +14,17 @@ prism2_srec.o: prism2_srec.c util.h
hostap_crypt_conf: hostap_crypt_conf.c
hostap_diag: hostap_diag.o util.o
- $(CC) -o hostap_diag $(CFLAGS) hostap_diag.o util.o
+ $(CC) -o hostap_diag $(CFLAGS) $(LDFLAGS) hostap_diag.o util.o
hostap_diag.o: hostap_diag.c util.h
util.o: util.c util.h
hostap_io_debug: hostap_io_debug.c
- $(CC) -o hostap_io_debug $(CFLAGS) hostap_io_debug.c
+ $(CC) -o hostap_io_debug $(CFLAGS) $(LDFLAGS) hostap_io_debug.c
hostap_rid: hostap_rid.o util.o
- $(CC) -o hostap_rid $(CFLAGS) hostap_rid.o util.o
+ $(CC) -o hostap_rid $(CFLAGS) $(LDFLAGS) hostap_rid.o util.o
hostap_rid.o: hostap_rid.c util.h

23
core/recipes-bsp/setserial/ldflags.patch
View File

@@ -1,23 +0,0 @@
---
Makefile.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- setserial-2.17.orig/Makefile.in
+++ setserial-2.17/Makefile.in
@@ -13,6 +13,7 @@ STRIP = @STRIP@
CC = @CC@
RM = rm -f
CFLAGS = @CFLAGS@
+LDFLAGS = @LDFLAGS@
DEFS = @DEFS@
INCS = -I.
TAR = tar
@@ -20,7 +21,7 @@ TAR = tar
all: setserial setserial.cat
setserial: setserial.c
- $(CC) $(CFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
setserial.cat: setserial.8
nroff -man setserial.8 > setserial.cat

2
core/recipes-bsp/setserial/setserial_2.17.bbappend
View File

@@ -1,2 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}:"
SRC_URI += "file://ldflags.patch"

79
core/recipes-connectivity/irda-utils/irda-utils/ldflags.patch
View File

@@ -1,79 +0,0 @@
---
findchip/Makefile | 2 +-
irattach/Makefile | 4 ++--
irdadump/Makefile | 2 +-
irdaping/Makefile | 2 +-
irnetd/Makefile | 2 +-
psion/Makefile | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
--- irda-utils-0.9.18.orig/findchip/Makefile
+++ irda-utils-0.9.18/findchip/Makefile
@@ -65,5 +65,5 @@ install: findchip
gfindchip: gfindchip.c
$(prn_cc)
- $(ECMD))$(CC) $(CFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `gtk-config --cflags` $< -o $@ `gtk-config --libs`
--- irda-utils-0.9.18.orig/irattach/Makefile
+++ irda-utils-0.9.18/irattach/Makefile
@@ -49,13 +49,13 @@ all: $(TARGETS)
irattach: irattach.o util.o
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) irattach.o util.o -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) irattach.o util.o -o $@
dongle_attach: dongle_attach.o
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) dongle_attach.o -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) dongle_attach.o -o $@
install: $(TARGETS)
--- irda-utils-0.9.18.orig/irdadump/Makefile
+++ irda-utils-0.9.18/irdadump/Makefile
@@ -40,7 +40,7 @@ lib_irdadump.a: $(LIBIRDADUMP_OBJS)
irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
.c.o:
--- irda-utils-0.9.18.orig/irdaping/Makefile
+++ irda-utils-0.9.18/irdaping/Makefile
@@ -56,7 +56,7 @@ all: $(TARGETS)
irdaping: $(OBJS)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
.c.o:
--- irda-utils-0.9.18.orig/irnetd/Makefile
+++ irda-utils-0.9.18/irnetd/Makefile
@@ -50,7 +50,7 @@ all: $(TARGETS)
irnetd: $(OBJS)
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(OBJS) -o $@
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
install: irnetd
--- irda-utils-0.9.18.orig/psion/Makefile
+++ irda-utils-0.9.18/psion/Makefile
@@ -25,4 +25,4 @@ install: $(PSION_TARGETS)
CFLAGS += -g -I../include -Wall -Wstrict-prototypes $(RPM_OPT_FLAGS)
irpsion5:
$(prn_cc_o)
- $(ECMD)$(CC) $(CFLAGS) $(PSION_SRC) -o $@
\ No newline at end of file
+ $(ECMD)$(CC) $(CFLAGS) $(LDFLAGS) $(PSION_SRC) -o $@
\ No newline at end of file

13
core/recipes-connectivity/irda-utils/irda-utils_0.9.18.bbappend
View File

@@ -1,13 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/irda-utils:"
SRC_URI += "file://ldflags.patch"
EXTRA_OEMAKE = "\
'CC=${CC}' \
'LD=${LD}' \
'CFLAGS=${CFLAGS}' \
'LDFLAGS=${LDFLAGS}' \
"
do_compile () {
oe_runmake
}

23
core/recipes-devtools/ossp-uuid/ossp-uuid/ldflags.patch
View File

@@ -1,23 +0,0 @@
Index: uuid-1.6.2/Makefile.in
===================================================================
--- uuid-1.6.2.orig/Makefile.in
+++ uuid-1.6.2/Makefile.in
@@ -113,15 +113,15 @@ all: $(TARGETS)
@$(LIBTOOL) --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $<
$(LIB_NAME): $(LIB_OBJS)
- @$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
+ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
-version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
$(DCE_NAME): $(DCE_OBJS)
- @$(LIBTOOL) --mode=link $(CC) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
+ @$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(DCE_NAME) $(DCE_OBJS) -rpath $(libdir) \
-version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
$(CXX_NAME): $(CXX_OBJS)
- @$(LIBTOOL) --mode=link $(CXX) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
+ @$(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $(CXX_NAME) $(CXX_OBJS) -rpath $(libdir) \
-version-info `$(SHTOOL) version -l c -d libtool $(S)/uuid_vers.h`
$(PRG_NAME): $(PRG_OBJS) $(LIB_NAME)

2
core/recipes-devtools/ossp-uuid/ossp-uuid_1.6.2.bbappend
View File

@@ -1,2 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI += "file://ldflags.patch"

3
core/recipes-devtools/python/python_2.7.3.bbappend
View File

@@ -1,3 +0,0 @@
do_compile_prepend () {
sed -i -e 's#^LDFLAGS=.*#LDFLAGS = -L. ${LDFLAGS}#g' Makefile
}

1
core/recipes-kernel/blktrace/blktrace_git.bbappend
View File

@@ -1 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}:"

93
core/recipes-kernel/blktrace/ldflags.patch
View File

@@ -1,93 +0,0 @@
blktrace: obey LDFLAGS
Upstream-Status: Pending
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
the patch was imported from meta-mentor layer on yoctoproject git server
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id
aed463414e2e2bf8ca44ba54ee5973e7ed599e57
Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
---
Makefile | 11 ++++++-----
btreplay/Makefile | 3 ++-
btt/Makefile | 3 ++-
3 files changed, 10 insertions(+), 7 deletions(-)
--- git.orig/Makefile
+++ git/Makefile
@@ -1,5 +1,6 @@
CC = gcc
CFLAGS = -Wall -O2 -g -W
+LDFLAGS =
ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
LIBS = -lpthread
@@ -23,19 +24,19 @@ btreplay/btreplay:
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
blktrace: blktrace.o act_mask.o
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
verify_blkparse: verify_blkparse.o
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
blkrawverify: blkrawverify.o
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
blkiomon: blkiomon.o rbtree.o
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt $(LDFLAGS)
$(PROGS): | depend
--- git.orig/btreplay/Makefile
+++ git/btreplay/Makefile
@@ -7,6 +7,7 @@
CC = gcc
CFLAGS = -Wall -W -O2 -g
+LDFLAGS =
INCS = -I. -I.. -I../btt
OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG
XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
@@ -32,10 +33,10 @@ clean: docsclean
$(CC) $(CFLAGS) -c -o $*.o $<
btrecord: btrecord.o
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
btreplay: btreplay.o
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
depend:
@$(CC) -MM $(CFLAGS) *.c 1> .depend
--- git.orig/btt/Makefile
+++ git/btt/Makefile
@@ -7,6 +7,7 @@
CC = gcc
CFLAGS = -Wall -W -O2 -g
+LDFLAGS =
INCS = -I. -I..
XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
override CFLAGS += $(INCS) $(XCFLAGS)
@@ -38,7 +39,7 @@ clean: docsclean
$(CC) $(CFLAGS) -c -o $*.o $<
btt: $(OBJS)
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS)
ifneq ($(wildcard .depend),)
include .depend

21
core/recipes-support/gdbm/gdbm/ldflags.patch
View File

@@ -1,21 +0,0 @@
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- gdbm-1.8.3.orig/Makefile.in
+++ gdbm-1.8.3/Makefile.in
@@ -156,12 +156,12 @@ install-compat:
libgdbm.la: $(LOBJS) gdbm.h
rm -f libgdbm.la
- $(LIBTOOL) --mode=link $(CC) -o libgdbm.la -rpath $(libdir) \
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm.la -rpath $(libdir) \
-version-info $(SHLIB_VER) $(LOBJS)
libgdbm_compat.la: $(C_LOBJS) gdbm.h
rm -f libgdbm_compat.la
- $(LIBTOOL) --mode=link $(CC) -o libgdbm_compat.la -rpath $(libdir) \
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libgdbm_compat.la -rpath $(libdir) \
-version-info $(SHLIB_VER) $(C_LOBJS)
gdbm.h: gdbm.proto gdbmerrno.h gdbm.proto2

2
core/recipes-support/gdbm/gdbm_1.8.3.bbappend
View File

@@ -1,2 +0,0 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/gdbm:"
SRC_URI += "file://ldflags.patch"