From d06a34d73c746316727c05327b062d71a6c6bbbb Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Fri, 13 Jul 2012 21:28:50 +0000 Subject: Fix path to as and m4 --- onbld/debian/patches/path.patch | 23 +++++++++++++++++++++++ onbld/debian/patches/series | 1 + 2 files changed, 24 insertions(+) create mode 100644 onbld/debian/patches/path.patch diff --git a/onbld/debian/patches/path.patch b/onbld/debian/patches/path.patch new file mode 100644 index 0000000..2c875a2 --- /dev/null +++ b/onbld/debian/patches/path.patch @@ -0,0 +1,23 @@ +Description: explicitly set paths to assembler and m4 + Actually, "aw" want "gas", and bintuils provides symlink "gas" -> "as" + +Index: onbld/illumos-gate/usr/src/tools/aw/Makefile +=================================================================== +--- onbld.orig/illumos-gate/usr/src/tools/aw/Makefile 2012-06-26 00:14:27.000000000 +0000 ++++ onbld/illumos-gate/usr/src/tools/aw/Makefile 2012-07-13 21:25:25.616343814 +0000 +@@ -36,11 +36,11 @@ + + LINTFLAGS += -ux -Xa -errchk=locfmtchk,parentheses + +-CPPFLAGS += -DDEFAULT_AS_DIR='"$(GNU_ROOT)/bin"' +-CPPFLAGS += -DDEFAULT_AS64_DIR='"$(GNU_ROOT)/bin"' +-CPPFLAGS += -DDEFAULT_M4_DIR='"/usr/ccs/bin"' ++CPPFLAGS += -DDEFAULT_AS_DIR='"/usr/bin"' ++CPPFLAGS += -DDEFAULT_AS64_DIR='"/usr/bin"' ++CPPFLAGS += -DDEFAULT_M4_DIR='"/usr/bin"' + CPPFLAGS += -DDEFAULT_M4LIB_DIR='"/usr/ccs/lib"' +-CPPFLAGS += -DDEFAULT_CPP_DIR='"/usr/ccs/lib"' ++CPPFLAGS += -DDEFAULT_CPP_DIR='"/usr/bin"' + + .KEEP_STATE: + diff --git a/onbld/debian/patches/series b/onbld/debian/patches/series index 3bd8c68..94dde0e 100644 --- a/onbld/debian/patches/series +++ b/onbld/debian/patches/series @@ -11,3 +11,4 @@ protolist.x86_64.patch no-elfsign.patch postpone-ctf-stabs.patch local-libctf.patch +path.patch -- cgit v1.2.3