diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/httpd-2.4.25.local.patch | 16 | ||||
| -rw-r--r-- | patches/httpd/no-codegen.patch | 26 |
2 files changed, 26 insertions, 16 deletions
diff --git a/patches/httpd-2.4.25.local.patch b/patches/httpd-2.4.25.local.patch index 32b5abfb..6e76d75f 100644 --- a/patches/httpd-2.4.25.local.patch +++ b/patches/httpd-2.4.25.local.patch @@ -60,19 +60,3 @@ diff -ru --new-file httpd-2.4.25.orig/server/test_char.h httpd-2.4.25/server/tes + 0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e,0x17e +}; ---- httpd-2.4.25/server/Makefile.in.orig 2013-10-02 12:20:14.000000000 +0000 -+++ httpd-2.4.25/server/Makefile.in 2017-02-02 23:55:21.521675844 +0000 -@@ -23,10 +23,10 @@ - include $(top_builddir)/build/rules.mk - include $(top_srcdir)/build/library.mk - --gen_test_char_OBJECTS = gen_test_char.lo --gen_test_char: $(gen_test_char_OBJECTS) -- $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) -+gen_test_char: gen_test_char.o -+ gcc -I$(shell x86_64-nt64-midipix-apr-1-config --includedir) -o $@ $< - -+#If this file is missing, you're doing something wrong... - test_char.h: gen_test_char - ./gen_test_char > test_char.h - diff --git a/patches/httpd/no-codegen.patch b/patches/httpd/no-codegen.patch new file mode 100644 index 00000000..45948b24 --- /dev/null +++ b/patches/httpd/no-codegen.patch @@ -0,0 +1,26 @@ +diff -ru httpd-2.4.25.orig/server/Makefile.in httpd-2.4.25/server/Makefile.in +--- httpd-2.4.25.orig/server/Makefile.in 2013-10-02 14:20:14.000000000 +0200 ++++ httpd-2.4.25/server/Makefile.in 2020-04-25 20:35:23.286880934 +0200 +@@ -16,22 +16,11 @@ + eoc_bucket.c eor_bucket.c core_filters.c \ + util_expr_parse.c util_expr_scan.c util_expr_eval.c + +-LTLIBRARY_DEPENDENCIES = test_char.h +- + TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp + + include $(top_builddir)/build/rules.mk + include $(top_srcdir)/build/library.mk + +-gen_test_char_OBJECTS = gen_test_char.lo +-gen_test_char: $(gen_test_char_OBJECTS) +- $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) +- +-test_char.h: gen_test_char +- ./gen_test_char > test_char.h +- +-util.lo: test_char.h +- + EXPORT_DIRS = $(top_srcdir)/include $(top_srcdir)/os/$(OS_DIR) + EXPORT_DIRS_APR = $(APR_INCLUDEDIR) $(APU_INCLUDEDIR) + |