3 files changed, 28 insertions, 0 deletions
diff --git a/bootadm/debian/patches/bootadm-use-gnu-ld.patch b/bootadm/debian/patches/bootadm-use-gnu-ld.patch
new file mode 100644
index 0000000..b1b851c
--- /dev/null
+++ b/bootadm/debian/patches/bootadm-use-gnu-ld.patch
@@ -0,0 +1,24 @@
+Description: remove unsupported options for GNU ld
+ It is desirable to use GNU ld, because sunld forces
+ base symbols version (option --default-imported-symver for GNU ld),
+ causing bootadm require gzwrite@libz.so.1, but gzwrite
+ has no version assigned in libz.
+ XXX@libz.so.1 does not hurt illumos ld.so.1, but we are going
+ to use GNU ld where possible in any way (XXX patch dh-illumos?)
+
+Index: bootadm/usr/src/cmd/boot/bootadm/Makefile
+===================================================================
+--- bootadm.orig/usr/src/cmd/boot/bootadm/Makefile	2013-01-02 03:45:22.556562126 +0400
++++ bootadm/usr/src/cmd/boot/bootadm/Makefile	2013-01-02 03:48:27.690051012 +0400
+@@ -51,6 +51,11 @@
+ LINTFLAGS += -erroff=E_INCONS_VAL_TYPE_DECL2
+ LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
+ 
++BDIRECT =
++MAPFILE.NES =
++MAPFILE.NED =
++MAPFILE.PGA =
++
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS) bootadm.h
diff --git a/bootadm/debian/patches/series b/bootadm/debian/patches/series
index 201e4f6..b6e490a 100644
--- a/bootadm/debian/patches/series
+++ b/bootadm/debian/patches/series
@@ -4,3 +4,4 @@ bootadm-avoid-libadm.patch
 bootadm-avoid-smf.patch
 dyson-bootadm-disable-multiarch.patch
 bootadm-redundlant-libfdisk.patch
+bootadm-use-gnu-ld.patch
diff --git a/bootadm/debian/rules b/bootadm/debian/rules
index bb3e1cc..ea18a4d 100755
--- a/bootadm/debian/rules
+++ b/bootadm/debian/rules
@@ -16,6 +16,9 @@ unpack-stamp:
 
 	# Buggy and unused:
 	echo > usr/src/Makefile.msg.targ
+
+	# Use GNU ld, see also the bootadm-use-gnu-ld.patch patch
+	sed -i '/LD_ALTEXEC/d' usr/env.sh
 	touch $@
 
 patch: patch-stamp