ohnobinki_overlay Changeset - 1713acd3d554

Changeset - 1713acd3d554

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 14 years ago 2010-12-30 14:18:59
ohnobinki@ohnopublishing.net

sys-apps/busybox: Fix busybox ldflags/cflags patch to respect CFLAGS when necessary.

(Portage version: 2.2.0_alpha2-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

2 files changed with 19 insertions and 19 deletions:

sys-apps/busybox/Manifest

sys-apps/busybox/files/busybox-1.18.1-ldflags.patch

0 comments (0 inline, 0 general)

sys-apps/busybox/Manifest

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ @@
 Hash: SHA256
 AUX busybox-1.18.0-bb.patch 918 RMD160 e6a7be911deb07510ddf46b8a4b8b24ef5b1b29a SHA1 f4815f4cd948c300d65e553486c949c780f05752 SHA256 9e713de11f26a07e5a17d7e62eed7a10b163de91331d50541dcc2c037acbcb67
-AUX busybox-1.18.1-ldflags.patch 3584 RMD160 81fad3e0be89638ecfddb6f655c6a3413821e150 SHA1 7e216d05b9adb0965de333a6e60a12bb319bc8df SHA256 72b6f002fdc99f329ffa5f9c17f02ec350ed700c768f2f61f9ba88e6c83445ae
+AUX busybox-1.18.1-ldflags.patch 3614 RMD160 7f27232505103301aa46e2df754292fee7db93f8 SHA1 424de3c85f0da0e06bfc044450b26c10eb694a28 SHA256 7a66a5ac4fbca0d30a7e1a25c72775be9f2eff50fc1b6c765f769714e9056682
 AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b95da36c489cd12820513434a7a17ac3bffd1 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7
 AUX mdev.rc 282 RMD160 6a11e23fbed92acd24088a7885bdc52b9c845fac SHA1 46f1a0494e009332e83b62599842f8213b60ba60 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5
 AUX mdev/dvbdev 356 RMD160 db7f546ae6e47b59cca9712f1e218cdbc3985c78 SHA1 993c0ab79fa41912f84db95e7dd09aa0965aa8c7 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e201419b08c4e71de
@@ @@ -15,17 +15,17 @@ MISC metadata.xml 368 RMD160 2facee7f44b @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 iQIcBAEBCAAGBQJNGf7HAAoJEHQ6UuhrqBBQonoP/3x2Sj9PNZJ+T/RzJrEqls8/
 IDmZbGrN99hXJ1yfbahvg+tdRy24KFZCgmiP5uaeUdTGpdMaU60gkEM2g6NvREh0
 Cea+t/2XPN8iKIK22BNXHblQfPS2SFk1gd+wXXYk2F7qOR11E1UuWt5QIXsEo08N
 hLJT8EdX8wlXR7B2bx+/1ZzKC6/CNmDk3KyU22ZT8eiUnjfNBqc/Frq6c9KkCqp7
 C+Ek6mqYe4sN0mwzglqQhyNIr+8HL87GfwG1VjOffYOlawsmKqMvH4ZtYDLiYHs0
 hZ1n1hn2a2x1plVRa9XrhiXs3/ZPG6f0AraAH4PkeyZ+abDO4OgcK1fkFbD6QxlK
 huGs4R8a9JCSTI1mHOrxHYXk2mkPCoK0iOOrgikMl3rDGkrZ1EnGXtcT1KVCHrW
 HIc5GMLSli+Y8L5tbjGOTyb6dbkGaW4lN3/ptyqKZW+zjTDo+MtODxQFKAxDDe
 rZIOwDRvxfYPIVQJotjDRW2RBeLmUrApLZv5GJBWVjdjHrNt6jh4BQQp/YGi8uzN
 lXojSE945eFzgY8G2koG8qBqFVUWTnIcc9uRs3D2VeWMp6xlD58dAoGDV3EI5XhF
 s+htlOGKG3tVxzDN2knzbYTVLBFHjY3VRuNKgb14jd/l88l/Mj+GZS3mUJdfsTTk
 Uk8zFHG0K2p47JLD0H1E
 =nbVp
 iQIcBAEBCAAGBQJNHNsjAAoJEHQ6UuhrqBBQz5IP/jEhY77z2eP3O1cu021CroxR
 oVSdKNubVZUYNZZQDv1OUanmUYqGGJLFKgQxbhWlLANLR1nwo84F39pAD17d0WE+
 HCxEqF5Sl3jWxdfCME5pGObYzASiaeLA4RaWzR1qZaqkUWW1rPatIwQJ16ZZbPTl
 YRtD6QG28MKKtrKXwTeeJYX3ZJfbmlppWU735cDQpEdMuMgop38aQRYt/TOJuE2a
 ujQC0/6u5o/PvMY4CRan9b3N6C3zuTWKQPyXPRVLq3BTJe4WjSB9+91H3oHFS8m9
 u3CJzdfGRic5tStkXLakDSG1yLdH7FtsgbaOZmc5eLTACQPiY+oTh3P/P5jgn9EN
 ZjI2RGxt2qcGBcqANqWSppTQx4gdS423mxzvXyDE/1ubL5zfCrjRrcaRAJQeniCL
 QOy3Xx7+Cd681FAyJZZk83WIf0xSc5fDOYr+riWfKzRDws+3d6wG5qnO3GV1f
 hc6BWc0GIWqBBWMPoxNvcPadtLJwVhLq2MlFTU7prX3MEtsmqQbKAS2zW0rK2pi5
 BSKUisD0KN8FOG9vUq0Bimah4eopG56QEWRoPQ5B+dx7R5xdlOAYUdXs3AaFeMy5
 +q08KmQbms8qBu7Q+6bMgVXYRGgHA5kAGJEpBXsAzHX7etal82X7V9myuHQr73ly
 xA0U7LF1TBEQGD0Fji7b
 =xhqo
 -----END PGP SIGNATURE-----

sys-apps/busybox/files/busybox-1.18.1-ldflags.patch

➞

Show inline comments

@@ @@ -22,7 +22,7 @@ index d9204f4..e9b4700 100644 @@
  export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
  export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
-index 5685b5b..a3926ab 100644
+index 5685b5b..5e733f8 100644
 --- a/scripts/Makefile.build
 +++ b/scripts/Makefile.build
@@ -174,7 +174,7 @@ cmd_modversions =							\
@@ @@ -48,16 +48,16 @@ index 5685b5b..a3926ab 100644 @@
  quiet_cmd_link_multi-y = LD      $@
 -cmd_link_multi-y = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps)
 +cmd_link_multi-y = $(CC) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(link_multi_deps)
++cmd_link_multi-y = $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_r) -o $@ $(link_multi_deps)
  quiet_cmd_link_multi-m = LD [M]  $@
 -cmd_link_multi-m = $(LD) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
 +cmd_link_multi-m = $(CC) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
++cmd_link_multi-m = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_MODULE) -o $@ $(link_multi_deps)
  # We would rather have a list of rules like
  # 	foo.o: $(foo-objs)
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index 3e54ea7..fbdf2a6 100644
+index 3e54ea7..342b0d6 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
@@ -117,12 +117,7 @@ a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \
@@ @@ -83,7 +83,7 @@ index 3e54ea7..fbdf2a6 100644 @@
 -quiet_cmd_ld = LD      $@
 -cmd_ld = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) \
 +quiet_cmd_ld = CCLD    $@
 +cmd_ld = $(CC) $(ld_flags) $(LDFLAGS_$(@F)) \
++cmd_ld = $(CC) $(CFLAGS) $(ld_flags) $(LDFLAGS_$(@F)) \
  	       $(filter-out FORCE,$^) -o $@
  # Objcopy

0 comments (0 inline, 0 general)