Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

php8: fix linking on riscv64 platform (again)

Browse source 
The initial fix was done in a2e76e497.
Later we could revert it with 5779ae4c5 since a global fix
in gcc was deployed.

But now, PHP itself applied a workaround/fix in 8.2.8,
so that we now require the initial fix again.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
This commit is contained in:
Michael Heimpold 2023-06-03 17:57:18 +02:00
parent e350e8b894
commit 43b10ad9c1
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lang/php8/Makefile
View file

@ -94,7 +94,7 @@ endef
define Package/php8-cli define Package/php8-cli
$(call Package/php8/Default) $(call Package/php8/Default)
DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp +riscv64:libatomic
TITLE+= (CLI) TITLE+= (CLI)
endef endef
@ -105,7 +105,7 @@ endef
define Package/php8-cgi define Package/php8-cgi
$(call Package/php8/Default) $(call Package/php8/Default)
DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp +riscv64:libatomic
TITLE+= (CGI & FastCGI) TITLE+= (CGI & FastCGI)
endef endef
@ -127,7 +127,7 @@ endef
define Package/php8-fpm define Package/php8-fpm
$(call Package/php8/Default) $(call Package/php8/Default)
DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp +riscv64:libatomic
TITLE+= (FPM) TITLE+= (FPM)
endef endef
@ -159,6 +159,7 @@ define Package/apache-mod-php8
CATEGORY:=Network CATEGORY:=Network
DEPENDS+=PACKAGE_apache-mod-php8:apache \ DEPENDS+=PACKAGE_apache-mod-php8:apache \
+PACKAGE_php8-mod-intl:libstdcpp \ +PACKAGE_php8-mod-intl:libstdcpp \
+riscv64:libatomic \
+libpcre2 +zlib +libpcre2 +zlib
TITLE:=PHP8 module for Apache Web Server TITLE:=PHP8 module for Apache Web Server
endef endef
@ -197,6 +198,9 @@ endif
ifeq ($(CONFIG_USE_MUSL),y) ifeq ($(CONFIG_USE_MUSL),y)
TARGET_CFLAGS += -D_LARGEFILE64_SOURCE TARGET_CFLAGS += -D_LARGEFILE64_SOURCE
endif endif
ifneq ($(findstring riscv64,$(CONFIG_ARCH)),)
TARGET_LDFLAGS += -latomic
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-bcmath),) ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-bcmath),)
CONFIGURE_ARGS+= --enable-bcmath=shared CONFIGURE_ARGS+= --enable-bcmath=shared
@ -603,6 +607,8 @@ define BuildModule
define Package/php8-mod-$(1) define Package/php8-mod-$(1)
$(call Package/php8/Default) $(call Package/php8/Default)
DEPENDS+=+riscv64:libatomic
ifneq ($(3),) ifneq ($(3),)
DEPENDS+=$(3) DEPENDS+=$(3)
endif endif