karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

uclibc: rediffed exisiting binutils patches

user/karasz/test/ecn
Christian Wiese 16 years ago committed by Alejandro Mery
parent
0b150d7467
commit
aeb56a86d7
2 changed files with 27 additions and 70 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      base/uclibc/pkg_patch/binutils/300-001_ld_makefile_patch.patch
  2. 51
      base/uclibc/pkg_patch/binutils/300-012_check_ldrunpath_length.patch

46
base/uclibc/pkg_patch/binutils/300-001_ld_makefile_patch.patch
Unescape View File

@ -2,8 +2,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../uclibc/pkg_patch/binutils-300-001_ld_makefile_patch.patch # Filename: package/.../uclibc/pkg_patch/binutils/300-001_ld_makefile_patch.patch
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 - 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -16,36 +16,13 @@
# version. # version.
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
## 001_ld_makefile_patch.dpatch Description: correct where ld scripts are installed
## Original Author: Chris Chimelis <[email protected]>
## All lines beginning with `## DP:' are a description of the patch.
## DP: Description: correct where ld scripts are installed
## DP: Author: Chris Chimelis <[email protected]>
## DP: Upstream status: N/A
## DP: Date: ??
if [ $# -ne 1 ]; then diff -ruN binutils-2.20.51.0.3-orig/ld/Makefile.am binutils-2.20.51.0.3/ld/Makefile.am
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" --- binutils-2.20.51.0.3-orig/ld/Makefile.am 2009-11-11 17:53:31.000000000 +0100
exit 1 +++ binutils-2.20.51.0.3/ld/Makefile.am 2009-12-09 11:55:15.000000000 +0100
fi @@ -24,7 +24,7 @@
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
--- binutils-2.16.91.0.1/ld/Makefile.am
+++ binutils-2.16.91.0.1/ld/Makefile.am
@@ -20,7 +20,7 @@
# We put the scripts in the directory $(scriptdir)/ldscripts. # We put the scripts in the directory $(scriptdir)/ldscripts.
# We can't put the scripts in $(datadir) because the SEARCH_DIR # We can't put the scripts in $(datadir) because the SEARCH_DIR
# directives need to be different for native and cross linkers. # directives need to be different for native and cross linkers.
@ -54,9 +31,10 @@ exit 0
EMUL = @EMUL@ EMUL = @EMUL@
EMULATION_OFILES = @EMULATION_OFILES@ EMULATION_OFILES = @EMULATION_OFILES@
--- binutils-2.16.91.0.1/ld/Makefile.in diff -ruN binutils-2.20.51.0.3-orig/ld/Makefile.in binutils-2.20.51.0.3/ld/Makefile.in
+++ binutils-2.16.91.0.1/ld/Makefile.in --- binutils-2.20.51.0.3-orig/ld/Makefile.in 2009-11-11 17:53:31.000000000 +0100
@@ -268,7 +268,7 @@ +++ binutils-2.20.51.0.3/ld/Makefile.in 2009-12-09 11:55:43.000000000 +0100
@@ -335,7 +335,7 @@
# We put the scripts in the directory $(scriptdir)/ldscripts. # We put the scripts in the directory $(scriptdir)/ldscripts.
# We can't put the scripts in $(datadir) because the SEARCH_DIR # We can't put the scripts in $(datadir) because the SEARCH_DIR
# directives need to be different for native and cross linkers. # directives need to be different for native and cross linkers.

51
base/uclibc/pkg_patch/binutils/300-012_check_ldrunpath_length.patch
Unescape View File

@ -2,8 +2,8 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# Filename: package/.../uclibc/pkg_patch/binutils-300-012_check_ldrunpath_length.patch # Filename: package/.../uclibc/pkg_patch/binutils/300-012_check_ldrunpath_length.patch
# Copyright (C) 2006 The OpenSDE Project # Copyright (C) 2006 - 2009 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -16,49 +16,28 @@
# version. # version.
# --- SDE-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
## 012_check_ldrunpath_length.dpatch by Chris Chimelis <[email protected]> Description: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
## cases where -rpath isn't specified. (see Debian Bug #151024)
## All lines beginning with `## DP:' are a description of the patch. Original Author: Chris Chimelis <[email protected]>
## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
## DP: cases where -rpath isn't specified. (#151024)
if [ $# -ne 1 ]; then diff -ruN binutils-2.20.51.0.3-orig/ld/emultempl/elf32.em binutils-2.20.51.0.3/ld/emultempl/elf32.em
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" --- binutils-2.20.51.0.3-orig/ld/emultempl/elf32.em 2009-11-11 17:53:30.000000000 +0100
exit 1 +++ binutils-2.20.51.0.3/ld/emultempl/elf32.em 2009-12-09 11:38:11.000000000 +0100
fi @@ -1250,6 +1250,8 @@
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100
+++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100
@@ -692,6 +692,8 @@
&& command_line.rpath == NULL) && command_line.rpath == NULL)
{ {
lib_path = (const char *) getenv ("LD_RUN_PATH"); lib_path = (const char *) getenv ("LD_RUN_PATH");
+ if ((lib_path) && (strlen (lib_path) == 0)) + if ((lib_path) && (strlen (lib_path) == 0))
+ lib_path = NULL; + lib_path = NULL;
if (gld${EMULATION_NAME}_search_needed (lib_path, &n, if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
force)) force))
break; break;
@@ -871,6 +873,8 @@ @@ -1476,6 +1478,8 @@
rpath = command_line.rpath; rpath = command_line.rpath;
if (rpath == NULL) if (rpath == NULL)
rpath = (const char *) getenv ("LD_RUN_PATH"); rpath = (const char *) getenv ("LD_RUN_PATH");
+ if ((rpath) && (strlen (rpath) == 0)) + if ((rpath) && (strlen (rpath) == 0))
+ rpath = NULL; + rpath = NULL;
if (! (bfd_elf_size_dynamic_sections
(output_bfd, command_line.soname, rpath, for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
command_line.filter_shlib, {

Write Preview
Loading…
Cancel
Save