components/curl/patches/004-Makefile.in.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Wed, 12 Oct 2016 05:02:11 -0700
changeset 7099 58b579e0ff32
parent 2151 8977d970976a
permissions -rw-r--r--
24836953 firefox/thunderbird js test failures
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2151
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
     1
Adjust how the stamp-h2: Makefile target works.
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
     2
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
     3
I'm not sure why this is here. It comes from the previous curl maintainer.
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
     4
It needs to be further investigated and either removed or reworked into
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
     5
something that can be passed upstream.
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
     6
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
     7
--- include/curl/Makefile.in.orig	2014-09-10 12:19:40.843896341 -0700
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
     8
+++ include/curl/Makefile.in	2014-09-10 12:20:56.618505665 -0700
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
     9
@@ -441,9 +441,9 @@
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
    10
 	@test -f $@ || rm -f stamp-h2
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
    11
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
174
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    12
 
959
7f6554cdc568 PSARC 2012/252 curl 7.26.0
Rich Burridge <rich.burridge@oracle.com>
parents: 174
diff changeset
    13
-stamp-h2: $(srcdir)/curlbuild.h.in $(top_builddir)/config.status
7f6554cdc568 PSARC 2012/252 curl 7.26.0
Rich Burridge <rich.burridge@oracle.com>
parents: 174
diff changeset
    14
+stamp-h2:
7f6554cdc568 PSARC 2012/252 curl 7.26.0
Rich Burridge <rich.burridge@oracle.com>
parents: 174
diff changeset
    15
 	@rm -f stamp-h2
174
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    16
-	cd $(top_builddir) && $(SHELL) ./config.status include/curl/curlbuild.h
2151
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
    17
+	touch $@
174
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    18
 
187aa0541610 7031766 LCMS needs to move to Userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset
    19
 distclean-hdr:
2151
8977d970976a PSARC 2014/332 curl version 7.38.0
Rich Burridge <rich.burridge@oracle.com>
parents: 959
diff changeset
    20
 	-rm -f curlbuild.h stamp-h2