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

Revert "php8: fix linking on riscv64 platform"

Browse source 
This reverts commit a2e76e4978.

Now that the issue is fixed on gcc side (see openwrt/openwrt@7b4a966),
we can revert this workaround here.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
This commit is contained in:
Michael Heimpold 2023-06-12 18:52:29 +02:00
parent 9365622f27
commit 5779ae4c5d
1 changed files with 3 additions and 9 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 +riscv64:libatomic DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp
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 +riscv64:libatomic DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp
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 +riscv64:libatomic DEPENDS+= +PACKAGE_php8-mod-intl:libstdcpp
TITLE+= (FPM) TITLE+= (FPM)
endef endef
@ -159,7 +159,6 @@ 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
@ -198,9 +197,6 @@ 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
@ -607,8 +603,6 @@ 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