diff options
| author | johans <johans@FreeBSD.org> | 2011-03-13 06:13:38 +0800 |
|---|---|---|
| committer | johans <johans@FreeBSD.org> | 2011-03-13 06:13:38 +0800 |
| commit | b63cb5b3fbb63830cc6b7cf9b6c25189f8f3ad87 (patch) | |
| tree | d5281110e008657511a87fc97165cb9619610d32 /lang | |
| parent | 5cc5f89f4ee6703741f45abbea8bc68cf2ccae42 (diff) | |
| download | freebsd-ports-gnome-b63cb5b3fbb63830cc6b7cf9b6c25189f8f3ad87.tar.gz freebsd-ports-gnome-b63cb5b3fbb63830cc6b7cf9b6c25189f8f3ad87.tar.zst freebsd-ports-gnome-b63cb5b3fbb63830cc6b7cf9b6c25189f8f3ad87.zip | |
Add a patch to fix the build error with pike's nettle module (again)
Reported by: pointyhat via pav
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/pike76/files/patch-ab | 6 | ||||
| -rw-r--r-- | lang/pike76/files/patch-install.pike | 6 | ||||
| -rw-r--r-- | lang/pike76/files/patch-src_modules_common_module_makefile.in | 20 |
3 files changed, 26 insertions, 6 deletions
diff --git a/lang/pike76/files/patch-ab b/lang/pike76/files/patch-ab index 2b0719daade4..9b499b01c374 100644 --- a/lang/pike76/files/patch-ab +++ b/lang/pike76/files/patch-ab @@ -1,6 +1,6 @@ ---- src/modules/_Image_FreeType/configure.orig Tue Nov 1 09:57:18 2005 -+++ src/modules/_Image_FreeType/configure Tue Nov 1 09:57:45 2005 -@@ -2682,8 +2682,8 @@ +--- src/modules/_Image_FreeType/configure.orig 2007-04-15 14:40:08.000000000 +0200 ++++ src/modules/_Image_FreeType/configure 2011-03-11 10:35:16.000000000 +0100 +@@ -2688,8 +2688,8 @@ echo "${ECHO_T}no" >&6 fi else diff --git a/lang/pike76/files/patch-install.pike b/lang/pike76/files/patch-install.pike index b2e5277102f6..6b191124df74 100644 --- a/lang/pike76/files/patch-install.pike +++ b/lang/pike76/files/patch-install.pike @@ -1,6 +1,6 @@ ---- bin/install.pike.orig Tue Nov 1 09:58:59 2005 -+++ bin/install.pike Tue Nov 1 09:59:20 2005 -@@ -1707,7 +1707,7 @@ +--- bin/install.pike.orig 2007-01-01 01:28:18.000000000 +0100 ++++ bin/install.pike 2011-03-11 10:35:16.000000000 +0100 +@@ -1707,7 +1707,7 @@ void do_install() if(file_stat(vars->MANDIR_SRC)) { diff --git a/lang/pike76/files/patch-src_modules_common_module_makefile.in b/lang/pike76/files/patch-src_modules_common_module_makefile.in new file mode 100644 index 000000000000..3be18eb332f7 --- /dev/null +++ b/lang/pike76/files/patch-src_modules_common_module_makefile.in @@ -0,0 +1,20 @@ +--- src/modules/common_module_makefile.in.orig 2011-03-12 19:54:33.000000000 +0100 ++++ src/modules/common_module_makefile.in 2011-03-12 19:54:35.000000000 +0100 +@@ -58,7 +58,7 @@ $(MODULE_ARCHIVES) ThisIsAPhonyTargetBla + .c.o: + @echo "Compiling $<" ;\ + rm -f $@.fail >/dev/null 2>&1; \ +- if $(CC) $(PREFLAGS) $(CFLAGS) -c $< -o $@ ; then : ; else \ ++ if $(CC) $(PREFLAGS) $(REAL_CPPFLAGS) $(CFLAGS) -c $< -o $@ ; then : ; else \ + status=$$?; \ + if test x"@noopt_retry@" = xyes ; then \ + echo "WARNING: Compiler failure! Trying without optimization!" >&2;\ +@@ -102,7 +102,7 @@ $(SRCDIR)/configure: $(SRCDIR)/configure + cd $(SRCDIR) && $(PIKE_SRC_DIR)/run_autoconfig . + + config.status: $(SRCDIR)/configure +- AR="$(AR)" CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" LDSHARED="$(REAL_LDSHARED)" CPPFLAGS="$(REAL_CPPFLAGS)" BUILDDIR="$(TMP_BUILDDIR)" BINDIR="$(TMP_BINDIR)" PIKE_SRC_DIR="$(PIKE_SRC_DIR)" BUILD_BASE="$(BUILD_BASE)" ./config.status --recheck ++ ./config.status --recheck AR="$(AR)" CFLAGS="$(REAL_CFLAGS)" LDFLAGS="$(REAL_LDFLAGS)" LDSHARED="$(REAL_LDSHARED)" CPPFLAGS="$(REAL_CPPFLAGS)" BUILDDIR="$(TMP_BUILDDIR)" BINDIR="$(TMP_BINDIR)" PIKE_SRC_DIR="$(PIKE_SRC_DIR)" BUILD_BASE="$(BUILD_BASE)" + + module.pmod: Makefile $(MODULE_PMOD_IN) + @if [ "x$(MODULE_PMOD_IN)" != "x" ]; then \ |