diff --git a/repos/dde_linux/run/wg_fetchurl.run b/repos/dde_linux/run/wg_fetchurl.run index 75035b5db0..5c43fbe5ad 100644 --- a/repos/dde_linux/run/wg_fetchurl.run +++ b/repos/dde_linux/run/wg_fetchurl.run @@ -29,6 +29,7 @@ import_from_depot [depot_user]/src/libc \ [depot_user]/src/libssh \ [depot_user]/src/lighttpd \ [depot_user]/src/openssl \ + [depot_user]/src/pcre \ [depot_user]/src/posix \ [depot_user]/src/vfs \ [depot_user]/src/vfs_lwip \ diff --git a/repos/dde_linux/run/wg_lighttpd.run b/repos/dde_linux/run/wg_lighttpd.run index 383ce7bc5e..6764e6afa3 100644 --- a/repos/dde_linux/run/wg_lighttpd.run +++ b/repos/dde_linux/run/wg_lighttpd.run @@ -29,6 +29,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/libssh \ [depot_user]/src/lighttpd \ [depot_user]/src/openssl \ + [depot_user]/src/pcre \ [depot_user]/src/posix \ [depot_user]/src/vfs \ [depot_user]/src/vfs_lwip \ diff --git a/repos/dde_linux/run/wg_reconfig.run b/repos/dde_linux/run/wg_reconfig.run index 47d556b2e5..32f7a8c1fa 100644 --- a/repos/dde_linux/run/wg_reconfig.run +++ b/repos/dde_linux/run/wg_reconfig.run @@ -25,6 +25,7 @@ import_from_depot [depot_user]/src/libc \ [depot_user]/src/libssh \ [depot_user]/src/lighttpd \ [depot_user]/src/openssl \ + [depot_user]/src/pcre \ [depot_user]/src/posix \ [depot_user]/src/vfs \ [depot_user]/src/vfs_lwip \ diff --git a/repos/dde_linux/run/wg_reconnect.run b/repos/dde_linux/run/wg_reconnect.run index 191a969e82..49eaf88fa3 100644 --- a/repos/dde_linux/run/wg_reconnect.run +++ b/repos/dde_linux/run/wg_reconnect.run @@ -73,6 +73,7 @@ lappend depot_archives [depot_user]/src/openssl lappend depot_archives [depot_user]/src/lighttpd lappend depot_archives [depot_user]/src/nic_router lappend depot_archives [depot_user]/src/openssl +lappend depot_archives [depot_user]/src/pcre lappend depot_archives [depot_user]/src/posix lappend depot_archives [depot_user]/src/report_rom lappend depot_archives [depot_user]/src/[rtc_binary_name] diff --git a/repos/ports/recipes/pkg/lighttpd/archives b/repos/ports/recipes/pkg/lighttpd/archives index f0cfb596ae..d6a4872f2f 100644 --- a/repos/ports/recipes/pkg/lighttpd/archives +++ b/repos/ports/recipes/pkg/lighttpd/archives @@ -1,6 +1,7 @@ _/src/libc _/src/lighttpd _/src/openssl +_/src/pcre _/src/posix _/src/vfs _/src/vfs_jitterentropy diff --git a/repos/ports/recipes/pkg/lighttpd/runtime b/repos/ports/recipes/pkg/lighttpd/runtime index a7c545b811..a400c9de47 100644 --- a/repos/ports/recipes/pkg/lighttpd/runtime +++ b/repos/ports/recipes/pkg/lighttpd/runtime @@ -50,6 +50,7 @@ dir-listing.activate = "enable" + diff --git a/repos/ports/recipes/src/lighttpd/used_apis b/repos/ports/recipes/src/lighttpd/used_apis index a983e21fac..9a2a287fe2 100644 --- a/repos/ports/recipes/src/lighttpd/used_apis +++ b/repos/ports/recipes/src/lighttpd/used_apis @@ -1,4 +1,5 @@ libc +pcre posix openssl zlib diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index 4c2a0b1506..fba3eaeb2a 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -18,6 +18,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/libssh \ [depot_user]/src/lighttpd \ [depot_user]/src/openssl \ + [depot_user]/src/pcre \ [depot_user]/src/posix \ [depot_user]/src/vfs \ [depot_user]/src/vfs_lwip \ diff --git a/repos/ports/run/lighttpd.run b/repos/ports/run/lighttpd.run index 64d4350afe..174dd2b700 100644 --- a/repos/ports/run/lighttpd.run +++ b/repos/ports/run/lighttpd.run @@ -28,6 +28,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/libssh \ [depot_user]/src/lighttpd \ [depot_user]/src/openssl \ + [depot_user]/src/pcre \ [depot_user]/src/posix \ [depot_user]/src/vfs \ [depot_user]/src/vfs_jitterentropy \ diff --git a/repos/ports/run/lighttpd_fetchurl.run b/repos/ports/run/lighttpd_fetchurl.run index 4dfef0829e..e290d9ed5a 100644 --- a/repos/ports/run/lighttpd_fetchurl.run +++ b/repos/ports/run/lighttpd_fetchurl.run @@ -25,6 +25,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/fetchurl \ [depot_user]/src/curl \ [depot_user]/src/openssl \ + [depot_user]/src/pcre \ [depot_user]/src/posix \ [depot_user]/src/vfs \ [depot_user]/src/vfs_[ip_stack] \ diff --git a/repos/ports/src/app/lighttpd/target.inc b/repos/ports/src/app/lighttpd/target.inc index 88ac7b5211..0b0d94fcfc 100644 --- a/repos/ports/src/app/lighttpd/target.inc +++ b/repos/ports/src/app/lighttpd/target.inc @@ -58,6 +58,7 @@ CC_OPT += -DHAVE_SYS_WAIT_H -DHAVE_SYS_UN_H -DHAVE_MMAP -DHAVE_SYS_MMAN_H -DHAVE CC_OPT += -DHAVE_WRITEV -DUSE_WRITEV CC_OPT += -DHAVE_TIMEGM -DHAVE_UNISTD_H -DHAVE_SYS_TIME_H CC_OPT += -DHAVE_LIBSSL -DHAVE_OPENSSL_SSL_H +CC_OPT += -DHAVE_PCRE_H CC_OPT += -DSBIN_DIR="\"/sbin\"" CC_OPT += -DPACKAGE_NAME="\"lighttpd\"" CC_OPT += -DLIGHTTPD_VERSION_ID='($(LIGHTTPD_MAIN) << 16 | $(LIGHTTPD_MAJOR) << 8 | $(LIGHTTPD_MINOR))' diff --git a/repos/ports/src/app/lighttpd/target.mk b/repos/ports/src/app/lighttpd/target.mk index 0f292930fd..5e37ed88d7 100644 --- a/repos/ports/src/app/lighttpd/target.mk +++ b/repos/ports/src/app/lighttpd/target.mk @@ -2,6 +2,6 @@ TARGET = lighttpd include $(REP_DIR)/src/app/lighttpd/target.inc -LIBS += libc libm +LIBS += libc libm pcre CC_CXX_WARN_STRICT =