From 6b26207ec3b6b096b73c484145effa37ff726a2d Mon Sep 17 00:00:00 2001 From: logwang Date: Tue, 20 Jun 2017 11:19:01 +0800 Subject: [PATCH] Nginx auto/make compatible with /bin/sh --- app/nginx-1.11.10/auto/make | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/nginx-1.11.10/auto/make b/app/nginx-1.11.10/auto/make index 5721c6c2a..e7928fcf6 100644 --- a/app/nginx-1.11.10/auto/make +++ b/app/nginx-1.11.10/auto/make @@ -28,12 +28,12 @@ if [ ! $FF_DPDK ]; then echo "FF_DPDK environment variable not defined, default:$FF_DPDK" fi -CORE_LIBS+=" -L$FF_PATH/lib -L$FF_DPDK/lib -Wl,--whole-archive,-lfstack,--no-whole-archive" -CORE_LIBS+=" -g -Wl,--no-as-needed -fvisibility=default -pthread -lm -lrt" -CORE_LIBS+=" -Wl,--whole-archive -lrte_pmd_vmxnet3_uio -lrte_pmd_i40e -lrte_pmd_ixgbe -lrte_pmd_e1000 -lrte_pmd_ring" -CORE_LIBS+=" -Wl,--whole-archive -lrte_hash -lrte_kvargs -Wl,-lrte_mbuf -lethdev -lrte_eal -Wl,-lrte_mempool" -CORE_LIBS+=" -lrte_ring -lrte_cmdline -lrte_cfgfile -lrte_kni -lrte_timer -Wl,-lrte_pmd_virtio" -CORE_LIBS+=" -Wl,--no-whole-archive -lrt -lm -ldl -lcrypto" +CORE_LIBS="$CORE_LIBS -L$FF_PATH/lib -L$FF_DPDK/lib -Wl,--whole-archive,-lfstack,--no-whole-archive" +CORE_LIBS="$CORE_LIBS -g -Wl,--no-as-needed -fvisibility=default -pthread -lm -lrt" +CORE_LIBS="$CORE_LIBS -Wl,--whole-archive -lrte_pmd_vmxnet3_uio -lrte_pmd_i40e -lrte_pmd_ixgbe -lrte_pmd_e1000 -lrte_pmd_ring" +CORE_LIBS="$CORE_LIBS -Wl,--whole-archive -lrte_hash -lrte_kvargs -Wl,-lrte_mbuf -lethdev -lrte_eal -Wl,-lrte_mempool" +CORE_LIBS="$CORE_LIBS -lrte_ring -lrte_cmdline -lrte_cfgfile -lrte_kni -lrte_timer -Wl,-lrte_pmd_virtio" +CORE_LIBS="$CORE_LIBS -Wl,--no-whole-archive -lrt -lm -ldl -lcrypto" cat << END > $NGX_MAKEFILE