diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-03-30 01:42:12 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-03-30 01:42:12 +0000 |
| commit | 988d61a98039efd8d6a770b5e16f20a379bef0ca (patch) | |
| tree | e0c0cdb0fbfc73fff2b738f6002507843c82cdef /illumos-grub/debian | |
| parent | c595e5d7947c2e47427f7e1287451c15b91163db (diff) | |
| download | illumos-packaging-988d61a98039efd8d6a770b5e16f20a379bef0ca.tar.gz | |
Need to disable build-id, add -fno-reorder-functions
Diffstat (limited to 'illumos-grub/debian')
| -rw-r--r-- | illumos-grub/debian/changelog | 2 | ||||
| -rw-r--r-- | illumos-grub/debian/control | 2 | ||||
| -rw-r--r-- | illumos-grub/debian/patches/grub-gnu-toolchain.patch | 24 |
3 files changed, 17 insertions, 11 deletions
diff --git a/illumos-grub/debian/changelog b/illumos-grub/debian/changelog index 4944540..d4178e4 100644 --- a/illumos-grub/debian/changelog +++ b/illumos-grub/debian/changelog @@ -2,4 +2,4 @@ illumos-grub (2.10-1) unstable; urgency=low * Initial release. - -- Igor Pashev <pashev.igor@gmail.com> Tue, 26 Mar 2013 23:01:25 +0000 + -- Igor Pashev <pashev.igor@gmail.com> Sat, 30 Mar 2013 01:41:12 +0000 diff --git a/illumos-grub/debian/control b/illumos-grub/debian/control index 0909a71..7ce5aca 100644 --- a/illumos-grub/debian/control +++ b/illumos-grub/debian/control @@ -6,6 +6,8 @@ Build-Depends: dh-illumos, illumos-source-2.10, gcc-multilib [illumos-amd64], + libncurses5-dev, + lib32ncurses5-dev [illumos-amd64], sunmake, quilt, Standards-Version: 3.9.3 diff --git a/illumos-grub/debian/patches/grub-gnu-toolchain.patch b/illumos-grub/debian/patches/grub-gnu-toolchain.patch index 86d9fab..c2b9586 100644 --- a/illumos-grub/debian/patches/grub-gnu-toolchain.patch +++ b/illumos-grub/debian/patches/grub-gnu-toolchain.patch @@ -1,7 +1,7 @@ Index: illumos-grub/usr/src/grub/grub-0.97/Makefile.solaris.defs =================================================================== --- illumos-grub.orig/usr/src/grub/grub-0.97/Makefile.solaris.defs 2012-10-08 00:25:35.000000000 +0000 -+++ illumos-grub/usr/src/grub/grub-0.97/Makefile.solaris.defs 2013-03-26 18:55:24.304982248 +0000 ++++ illumos-grub/usr/src/grub/grub-0.97/Makefile.solaris.defs 2013-03-30 01:35:49.211230572 +0000 @@ -42,11 +42,11 @@ OPTION_FS = $(POUND_SIGN) @@ -9,16 +9,16 @@ Index: illumos-grub/usr/src/grub/grub-0.97/Makefile.solaris.defs -BASE_CFLAGS = -B$(GCC_ROOT)/bin/ -g $(CPPFLAGS) $(OPTFLAGS) -BASE_CCASFLAGS = -B$(GCC_ROOT)/bin/ -g $(CPPFLAGS) $(OPTFLAGS) -BASE_LDFLAGS = -+BASE_CFLAGS = -g $(CPPFLAGS) $(OPTFLAGS) ++BASE_CFLAGS = -g $(CPPFLAGS) $(OPTFLAGS) -Wl,--build-id=none +BASE_CCASFLAGS = -g $(CPPFLAGS) $(OPTFLAGS) -+BASE_LDFLAGS = -m elf_i386_sol2 ++BASE_LDFLAGS = -m elf_i386_sol2 --build-id=none -CC = $(GCC_ROOT)/bin/gcc +CC = /usr/bin/gcc -m32 CFLAGS = $(BASE_CFLAGS) CCDEPMODE = depmode=none -@@ -55,20 +55,10 @@ +@@ -55,32 +55,22 @@ CPP = $(CC) -E @@ -42,7 +42,10 @@ Index: illumos-grub/usr/src/grub/grub-0.97/Makefile.solaris.defs LDFLAGS = $(BASE_LDFLAGS) LINKFLAGS = -g LINK = $(CCLD) $(LINKFLAGS) $(LDFLAGS) -@@ -78,9 +68,9 @@ + + DEFS = -DHAVE_CONFIG_H -DSOLARIS_NETBOOT +-OPTFLAGS = -falign-jumps=1 -falign-loops=1 -falign-functions=1 ++OPTFLAGS = -falign-jumps=1 -falign-loops=1 -falign-functions=1 -fno-reorder-functions #WARNFLAGS = -Wall -Wmissing-prototypes -Wunused -Wshadow \ # -Wpointer-arith -Wundef @@ -50,14 +53,15 @@ Index: illumos-grub/usr/src/grub/grub-0.97/Makefile.solaris.defs +OBJCOPY = /usr/bin/objcopy -AR = /usr/ccs/bin/ar +-RANLIB = : +AR = /usr/bin/ar - RANLIB = : ++RANLIB = /usr/bin/ranlib MKDIR = mkdir -p Index: illumos-grub/usr/src/grub/grub-0.97/netboot/Makefile.solaris =================================================================== ---- illumos-grub.orig/usr/src/grub/grub-0.97/netboot/Makefile.solaris 2013-03-26 18:55:24.127214858 +0000 -+++ illumos-grub/usr/src/grub/grub-0.97/netboot/Makefile.solaris 2013-03-26 18:55:24.307083935 +0000 +--- illumos-grub.orig/usr/src/grub/grub-0.97/netboot/Makefile.solaris 2013-03-29 19:57:46.552873540 +0000 ++++ illumos-grub/usr/src/grub/grub-0.97/netboot/Makefile.solaris 2013-03-29 19:57:46.757709177 +0000 @@ -21,7 +21,7 @@ libdrivers_a-pci_io.o \ libdrivers_a-pic8259.o \ @@ -70,7 +74,7 @@ Index: illumos-grub/usr/src/grub/grub-0.97/netboot/Makefile.solaris Index: illumos-grub/usr/src/grub/grub-0.97/stage1/Makefile.solaris =================================================================== --- illumos-grub.orig/usr/src/grub/grub-0.97/stage1/Makefile.solaris 2012-10-08 00:25:37.000000000 +0000 -+++ illumos-grub/usr/src/grub/grub-0.97/stage1/Makefile.solaris 2013-03-26 18:55:24.309214454 +0000 ++++ illumos-grub/usr/src/grub/grub-0.97/stage1/Makefile.solaris 2013-03-29 19:57:46.759697832 +0000 @@ -15,7 +15,7 @@ @@ -83,7 +87,7 @@ Index: illumos-grub/usr/src/grub/grub-0.97/stage1/Makefile.solaris Index: illumos-grub/usr/src/grub/grub-0.97/stage2/Makefile.solaris =================================================================== --- illumos-grub.orig/usr/src/grub/grub-0.97/stage2/Makefile.solaris 2012-10-08 00:25:37.000000000 +0000 -+++ illumos-grub/usr/src/grub/grub-0.97/stage2/Makefile.solaris 2013-03-26 18:55:24.312008633 +0000 ++++ illumos-grub/usr/src/grub/grub-0.97/stage2/Makefile.solaris 2013-03-29 19:57:46.763174481 +0000 @@ -38,7 +38,7 @@ -DSYS_VSTAFS=1 # GRUB_CFLAGS += -DSUPPORT_HERCULES=1 |