diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-10-21 16:17:47 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-10-21 16:17:47 +0300 |
| commit | 387737bec5cffe479f15458fac2aad9648a2979e (patch) | |
| tree | e69e4e6e3b6469b582eb5d9bea6fca49e48e54f0 | |
| parent | ded7c4eb0028518f05bb4ebfa3e617169730d658 (diff) | |
| download | illumos-packaging-387737bec5cffe479f15458fac2aad9648a2979e.tar.gz | |
More quirks
| -rw-r--r-- | libc/debian/patches/gnu-make-quirks.patch | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/libc/debian/patches/gnu-make-quirks.patch b/libc/debian/patches/gnu-make-quirks.patch index bc1da17..a019b87 100644 --- a/libc/debian/patches/gnu-make-quirks.patch +++ b/libc/debian/patches/gnu-make-quirks.patch @@ -4,11 +4,11 @@ Description: Fixes for GNU make. others may need support from GNU make, for example: http://savannah.gnu.org/bugs/?37237 -Index: b/usr/src/lib/libc/Makefile.targ +Index: libc/usr/src/lib/libc/Makefile.targ =================================================================== ---- a/usr/src/lib/libc/Makefile.targ 2014-03-02 23:20:59.385270147 +0400 -+++ b/usr/src/lib/libc/Makefile.targ 2014-03-02 23:21:11.097475644 +0400 -@@ -53,10 +53,6 @@ +--- libc.orig/usr/src/lib/libc/Makefile.targ ++++ libc/usr/src/lib/libc/Makefile.targ +@@ -53,10 +53,6 @@ pics/%.o: $(LIBCBASE)/../$(TARGET_ARCH)/ $(BUILD.s) $(POST_PROCESS_O) @@ -19,7 +19,7 @@ Index: b/usr/src/lib/libc/Makefile.targ pics/%.o: $(LIBCBASE)/fp/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -@@ -276,19 +272,19 @@ +@@ -276,23 +272,23 @@ pics/%.o: $(SRC)/common/atomic/$(TARGETM $(BUILD.s) $(POST_PROCESS_O) @@ -43,10 +43,15 @@ Index: b/usr/src/lib/libc/Makefile.targ $(COMPILE.c) -o $@ $(SRC)/common/unicode/$(@F:.o=.c) $(POST_PROCESS_O) -Index: b/usr/src/Makefile.msg.targ +-$(CHACHAOBJS:%=pics/%): $(SRC)/common/crypto/chacha/$$(@F:.o=.c) ++$(CHACHAOBJS:%=pics/%): $(SRC)/common/crypto/chacha/$$(patsubst %.o,%.c,$$(@F)) + $(COMPILE.c) -I$(SRC)/common/crypto/chacha -DKEYSTREAM_ONLY \ + -o $@ $(SRC)/common/crypto/chacha/$(@F:.o=.c) + $(POST_PROCESS_O) +Index: libc/usr/src/Makefile.msg.targ =================================================================== ---- a/usr/src/Makefile.msg.targ 2014-03-02 23:20:33.768178253 +0400 -+++ b/usr/src/Makefile.msg.targ 2014-03-02 23:21:11.099559553 +0400 +--- libc.orig/usr/src/Makefile.msg.targ ++++ libc/usr/src/Makefile.msg.targ @@ -33,7 +33,7 @@ .PARALLEL: $(POFILES) $(MSGFILES) @@ -56,11 +61,11 @@ Index: b/usr/src/Makefile.msg.targ $(INS.dir) $(MSGDOMAINPOFILE): $(MSGDOMAIN) $(POFILE) -Index: b/usr/src/lib/libc/i386/Makefile.com +Index: libc/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- a/usr/src/lib/libc/i386/Makefile.com 2014-03-02 23:20:51.062923175 +0400 -+++ b/usr/src/lib/libc/i386/Makefile.com 2014-03-02 23:21:11.102603112 +0400 -@@ -1294,5 +1294,9 @@ +--- libc.orig/usr/src/lib/libc/i386/Makefile.com ++++ libc/usr/src/lib/libc/i386/Makefile.com +@@ -1314,5 +1314,9 @@ $(LIBCDIR)/port/gen/new_list.c: $(LIBCDI cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist pics/errlst.o: $(LIBCDIR)/port/gen/errlst.c @@ -70,11 +75,11 @@ Index: b/usr/src/lib/libc/i386/Makefile.com pics/new_list.o: $(LIBCDIR)/port/gen/new_list.c + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O) -Index: b/usr/src/lib/libc/amd64/Makefile +Index: libc/usr/src/lib/libc/amd64/Makefile =================================================================== ---- a/usr/src/lib/libc/amd64/Makefile 2014-03-02 23:20:33.768322967 +0400 -+++ b/usr/src/lib/libc/amd64/Makefile 2014-03-02 23:21:11.104864140 +0400 -@@ -1222,5 +1222,9 @@ +--- libc.orig/usr/src/lib/libc/amd64/Makefile ++++ libc/usr/src/lib/libc/amd64/Makefile +@@ -1240,5 +1240,9 @@ $(LIBCDIR)/port/gen/new_list.c: $(LIBCDI cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist pics/errlst.o: $(LIBCDIR)/port/gen/errlst.c |