diff options
| author | Ørjan Malde <red@foxi.me> | 2021-10-01 01:17:11 +0200 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2021-10-01 01:17:11 +0200 |
| commit | f4e59e8be3e98965b90e954a49b0aee30efadd6c (patch) | |
| tree | 2414e36abd75adb904ba5902c93fb0dfcc46c248 /patches | |
| parent | 673e249ded856b0f29d8bf5b17e015725aa00d21 (diff) | |
| download | midipix_build-f4e59e8be3e98965b90e954a49b0aee30efadd6c.tar.bz2 midipix_build-f4e59e8be3e98965b90e954a49b0aee30efadd6c.tar.xz | |
patches/php-8.0.11_pre.local.patch: link php{,cgi,dbg} against libphp.
Signed-off-by: Ørjan Malde <red@foxi.me>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/php-8.0.11_pre.local.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/patches/php-8.0.11_pre.local.patch b/patches/php-8.0.11_pre.local.patch index 5a7c0c6c..6b81cd0a 100644 --- a/patches/php-8.0.11_pre.local.patch +++ b/patches/php-8.0.11_pre.local.patch @@ -27,6 +27,42 @@ diff -ru php-8.0.8.orig/TSRM/TSRM.h php-8.0.8/TSRM/TSRM.h diff -ru php-8.0.1.orig/configure php-8.0.1/configure --- php-8.0.1.orig/configure 2021-01-05 14:54:54.000000000 +0100 +++ php-8.0.1/configure 2021-01-13 23:01:56.427279925 +0100 +@@ -7130,6 +7130,9 @@ + *darwin*) + BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" + ;; ++ *midipix*) ++ BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH) -L../../ -lphp" ++ ;; + *) + BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" + ;; +@@ -10622,14 +10625,12 @@ + + BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ + \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ +- \$(PHP_GLOBAL_OBJS:.lo=.o) \ +- \$(PHP_BINARY_OBJS:.lo=.o) \ + \$(PHP_PHPDBG_OBJS:.lo=.o) \ + \$(EXTRA_LIBS) \ + \$(PHPDBG_EXTRA_LIBS) \ + \$(ZEND_EXTRA_LIBS) \ + \$(PHP_FRAMEWORKS) \ +- -o \$(BUILD_BINARY)" ++ -o \$(BUILD_BINARY) -L../.. -lphp" + + BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \ + \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ +@@ -11098,6 +11099,9 @@ + *darwin*) + BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + ;; ++ *midipix*) ++ BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH) -L../../ -lphp" ++ ;; + *) + BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" + ;; @@ -52030,8 +52030,11 @@ $as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; } if test "$cross_compiling" = yes; then : |