diff --git a/Makefile b/Makefile index b5931e15..ce63e74e 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ BASE_MAKEFILES= alpine/Makefile \ rpm/SPECS/Makefile MODULES= geoip image-filter perl xslt -EXTERNAL_MODULES= auth-spnego brotli encrypted-session fips-check geoip2 headers-more lua ndk njs opentracing otel passenger rtmp set-misc subs-filter +EXTERNAL_MODULES= auth-spnego brotli encrypted-session fips-check geoip2 headers-more lua ndk njs otel passenger rtmp set-misc subs-filter ifeq ($(shell sha512sum --version >/dev/null 2>&1 || echo FAIL),) SHA512SUM = sha512sum diff --git a/alpine/Makefile b/alpine/Makefile index 57134b99..5aa28fd4 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -279,9 +279,6 @@ test: base nginx-tests if [ -d $$pwd/module-perl ]; then \ globals="$$globals env PERL5LIB=$$pwd/abuild-module-perl/src/$(MODULE_SRCDIR)/objs/src/http/modules/perl:$$pwd/abuild-module-perl/src/$(MODULE_SRCDIR)/objs/src/http/modules/perl/blib/arch;" ; \ fi ; \ - if [ -d $$pwd/module-opentracing ]; then \ - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$pwd/abuild-module-opentracing/src/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib ; \ - fi ; \ if [ -d $$pwd/module-lua ]; then \ globals_http="lua_package_path '$$pwd/abuild-module-lua/src/lua-resty-core-$(LUA_RESTY_CORE_VERSION)/lib/?.lua;$$pwd/abuild-module-lua/src/lua-resty-lrucache-$(LUA_RESTY_LRUCACHE_VERSION)/lib/?.lua;;';" ; \ globals_stream="$$globals_http" ; \ @@ -302,9 +299,6 @@ test-debug: base nginx-tests if [ -d $$pwd/module-perl ]; then \ globals="$$globals env PERL5LIB=$$pwd/abuild-module-perl/src/$(MODULE_SRCDIR)/objs/src/http/modules/perl:$$pwd/abuild-module-perl/src/$(MODULE_SRCDIR)/objs/src/http/modules/perl/blib/arch;" ; \ fi ; \ - if [ -d $$pwd/module-opentracing ]; then \ - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$pwd/abuild-module-opentracing/src/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib ; \ - fi ; \ if [ -d $$pwd/module-lua -a ! -e nginx-module-lua.skip ]; then \ globals_http="lua_package_path '$$pwd/abuild-module-lua/src/lua-resty-core-$(LUA_RESTY_CORE_VERSION)/lib/?.lua;$$pwd/abuild-module-lua/src/lua-resty-lrucache-$(LUA_RESTY_LRUCACHE_VERSION)/lib/?.lua;;';" ; \ globals_stream="$$globals_http" ; \ diff --git a/alpine/Makefile.module-opentracing b/alpine/Makefile.module-opentracing deleted file mode 100644 index bd812aca..00000000 --- a/alpine/Makefile.module-opentracing +++ /dev/null @@ -1,145 +0,0 @@ -MODULES+= opentracing - -MODULE_SUMMARY_opentracing= 3rd-party OpenTracing dynamic module - -include $(CONTRIB)/src/opentracing-cpp/version -include $(CONTRIB)/src/nginx-opentracing/version -include $(CONTRIB)/src/thrift/version -include $(CONTRIB)/src/json/version -include $(CONTRIB)/src/jaeger-client-cpp/version - -MODULE_VERSION_opentracing= $(NGINX_OPENTRACING_VERSION) -MODULE_RELEASE_opentracing= 1 - -MODULE_VERSION_PREFIX_opentracing=$(MODULE_TARGET_PREFIX) - -MODULE_SOURCES_opentracing= opentracing-cpp-$(OPENTRACING_CPP_VERSION).tar.gz \ - nginx-opentracing-$(NGINX_OPENTRACING_VERSION).tar.gz \ - json-$(JSON_VERSION).tar.gz \ - thrift-$(THRIFT_VERSION).tar.gz \ - jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION).tar.gz - -MODULE_PATCHES_opentracing= $(CONTRIB)/src/opentracing-cpp/CMakeLists.txt.patch \ - $(CONTRIB)/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch \ - $(CONTRIB)/src/jaeger-client-cpp/CMakeLists.txt.patch - -MODULE_CONFARGS_opentracing= --add-dynamic-module=$(MODSRC_PREFIX)nginx-opentracing-$(NGINX_OPENTRACING_VERSION)/opentracing - -.deps-module-opentracing: - cd $(CONTRIB) && make \ - .sum-opentracing-cpp \ - .sum-nginx-opentracing \ - .sum-json \ - .sum-thrift \ - .sum-jaeger-client-cpp - touch $@ - -prerequisites-for-module-opentracing: - -MODULE_BUILD_DEPENDS_opentracing=cmake yaml-cpp-dev boost-dev - -define MODULE_PREBUILD_opentracing - ( cd $$builddir/../opentracing-cpp-$(OPENTRACING_CPP_VERSION) \&\& \ - mkdir .build \&\& \ - cd .build \&\& \ - cmake .. \&\& \ - DESTDIR=`pwd`/.. make $$_make_opts install ) - ( cd $$builddir/../thrift-$(THRIFT_VERSION) \&\& \ - mkdir .build \&\& \ - cd .build \&\& \ - cmake \ - -DBUILD_TESTING=OFF \ - -DBUILD_TUTORIALS=OFF \ - -DBUILD_COMPILER=OFF \ - -DBUILD_C_GLIB=OFF \ - -DBUILD_JAVA=OFF \ - -DBUILD_JAVASCRIPT=OFF \ - -DBUILD_NODEJS=OFF \ - -DBUILD_PYTHON=OFF \ - -DWITH_QT5=OFF \ - -DWITH_SHARED_LIB=OFF \ - -DWITH_LIBEVENT=OFF \ - -DWITH_OPENSSL=OFF \ - -DWITH_ZLIB=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_INSTALL_PREFIX:STRING=$$builddir/../thrift-$(THRIFT_VERSION) \ - .. \&\& \ - make $$_make_opts install \&\& \ - ln -sf ThriftConfig.cmake $$builddir/../thrift-$(THRIFT_VERSION)/lib/cmake/thrift/thriftConfig.cmake \&\& \ - mkdir -p $$builddir/../thrift-$(THRIFT_VERSION)/bin/ ) - ( cd $$builddir/../json-$(JSON_VERSION) \&\& \ - mkdir .build \&\& \ - cd .build \&\& \ - cmake \ - -DJSON_BuildTests=OFF \ - -DJSON_BuildTests_INIT=OFF \ - -DJSON_Install=ON \ - -DCMAKE_INSTALL_PREFIX:STRING=$$builddir/../json-$(JSON_VERSION) \ - ../ \&\& \ - make $$_make_opts install ) - ( cd $$builddir/../jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION) \&\& \ - mkdir .build \&\& \ - cd .build \&\& \ - OpenTracing_DIR=$$builddir/../opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib/cmake/OpenTracing \ - thrift_DIR=$$builddir/../thrift-$(THRIFT_VERSION)/lib/cmake/thrift \ - nlohmann_json_DIR=$$builddir/../json-$(JSON_VERSION)/share/cmake/nlohmann_json \ - cmake \ - -DJAEGERTRACING_BUILD_EXAMPLES=OFF \ - -DBUILD_TESTING=OFF \ - -DJAEGERTRACING_PLUGIN=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DHUNTER_ENABLED=OFF \ - -DOPENTRACING_INC=$$builddir/../opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/include \ - ../ \&\& \ - DESTDIR=`pwd`/.. make $$_make_opts ) -endef -export MODULE_PREBUILD_opentracing - -MODULE_CC_OPT_opentracing=-I../opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/include -MODULE_CC_OPT_DEBUG_opentracing=$(MODULE_CC_OPT_opentracing) -MODULE_LD_OPT_opentracing=-L../opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib -MODULE_LD_OPT_DEBUG_opentracing=$(MODULE_LD_OPT_opentracing) - -define MODULE_PREINSTALL_opentracing - mkdir -p "$$pkgdir"/usr/lib - install -m755 ../opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib/libopentracing.so.$(OPENTRACING_CPP_VERSION) "$$pkgdir"/usr/lib/ - ln -fs libopentracing.so.$(OPENTRACING_CPP_VERSION) "$$pkgdir"/usr/lib/libopentracing.so.1 - ln -fs libopentracing.so.1 "$$pkgdir"/usr/lib/libopentracing.so - install -m755 ../opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib/libopentracing_mocktracer.so.$(OPENTRACING_CPP_VERSION) "$$pkgdir"/usr/lib/ - ln -fs libopentracing_mocktracer.so.$(OPENTRACING_CPP_VERSION) "$$pkgdir"/usr/lib/libopentracing_mocktracer.so.1 - ln -fs libopentracing_mocktracer.so.1 "$$pkgdir"/usr/lib/libopentracing_mocktracer.so - mkdir -p "$$pkgdir"/usr/include - cp -pr ../opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/include/opentracing "$$pkgdir"/usr/include/ - mkdir -p "$$pkgdir"/usr/libexec/opentracing - install -m755 ../jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION)/.build/libjaegertracing_plugin.so "$$pkgdir"/usr/libexec/opentracing/ -endef -export MODULE_PREINSTALL_opentracing - -define MODULE_POST_opentracing -cat <= 4.9") - endif() - --hunter_add_package(thrift) --find_package(thrift ${hunter_config} REQUIRED) --if(HUNTER_ENABLED) -- list(APPEND LIBS thrift::thrift_static) --else() -- list(APPEND LIBS ${THRIFT_LIBRARIES}) --endif() -+#hunter_add_package(thrift) -+#find_package(thrift ${hunter_config} REQUIRED) -+#if(HUNTER_ENABLED) -+# list(APPEND LIBS thrift::thrift_static) -+#else() -+# list(APPEND LIBS ${THRIFT_LIBRARIES}) -+#endif() -+#list(APPEND package_deps thrift) -+ -+# use our own prebuilt version of thrift -+include_directories(${THRIFT_INC}) -+find_package(thrift CONFIG REQUIRED) -+list(APPEND LIBS thrift::thrift) - list(APPEND package_deps thrift) - -- --hunter_add_package(opentracing-cpp) --# Not `${hunter_config}` because OpenTracing provides its own --# OpenTracingConfig.cmake file -+# use our own prebuilt version of opentracing-cpp -+include_directories(${OPENTRACING_INC}) - find_package(OpenTracing CONFIG REQUIRED) --# Under Windows, link dynamically with OpenTracing --if (WIN32) -- list(APPEND LIBS OpenTracing::opentracing) -- set(OPENTRACING_LIB OpenTracing::opentracing) --else() -- list(APPEND LIBS OpenTracing::opentracing-static) -- set(OPENTRACING_LIB OpenTracing::opentracing-static) --endif() -+list(APPEND LIBS OpenTracing::opentracing-static) -+set(OPENTRACING_LIB OpenTracing::opentracing-static) - list(APPEND package_deps OpenTracing) - --hunter_add_package(nlohmann_json) -+#hunter_add_package(nlohmann_json) - find_package(nlohmann_json CONFIG REQUIRED) - list(APPEND LIBS nlohmann_json::nlohmann_json) - list(APPEND package_deps nlohmann_json) -@@ -97,16 +95,8 @@ - "NOT JAEGERTRACING_BUILD_CROSSDOCK" ON) - - if(JAEGERTRACING_WITH_YAML_CPP) -- hunter_add_package(yaml-cpp) -- # Not `${hunter_config}` because yaml-cpp provides its own -- # yaml-cpp-config.cmake file -- find_package(yaml-cpp CONFIG REQUIRED) -- if(HUNTER_ENABLED) -- list(APPEND LIBS yaml-cpp::yaml-cpp) -- else() -- list(APPEND LIBS yaml-cpp) -- endif() -- list(APPEND package_deps yaml-cpp) -+ # rely on yaml-cpp provided by OS vendor -+ list(APPEND LIBS yaml-cpp) - endif() - - include(CTest) diff --git a/contrib/src/jaeger-client-cpp/CMakeLists.txt.suppress-gcc-version-check.patch b/contrib/src/jaeger-client-cpp/CMakeLists.txt.suppress-gcc-version-check.patch deleted file mode 100644 index b7b99b73..00000000 --- a/contrib/src/jaeger-client-cpp/CMakeLists.txt.suppress-gcc-version-check.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/CMakeLists.txt 2021-03-22 09:00:52.327615463 +0000 -+++ b/CMakeLists.txt 2021-03-22 09:01:09.287806286 +0000 -@@ -54,10 +54,10 @@ - - set(package_deps) - --if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND -- CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") -- message(FATAL_ERROR "Must use gcc >= 4.9") --endif() -+#if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND -+# CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9") -+# message(FATAL_ERROR "Must use gcc >= 4.9") -+#endif() - - #hunter_add_package(thrift) - #find_package(thrift ${hunter_config} REQUIRED) diff --git a/contrib/src/jaeger-client-cpp/Makefile b/contrib/src/jaeger-client-cpp/Makefile deleted file mode 100644 index 6efd1796..00000000 --- a/contrib/src/jaeger-client-cpp/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# jaeger-client-cpp - -include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/version -JAEGER_CLIENT_CPP_URL := $(GITHUB)/jaegertracing/jaeger-client-cpp/archive/v$(JAEGER_CLIENT_CPP_VERSION).tar.gz - -PKGS += jaeger-client-cpp - -$(TARBALLS)/jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION).tar.gz: - $(call download_pkg,$(JAEGER_CLIENT_CPP_URL),jaeger-client-cpp) - -.sum-jaeger-client-cpp: jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION).tar.gz - -jaeger-client-cpp: jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION).tar.gz .sum-jaeger-client-cpp - $(UNPACK) - $(APPLY) $(SRC)/jaeger-client-cpp/CMakeLists.txt.patch -ifeq ($(shell rpm --version >/dev/null 2>&1 || echo FAIL),) -ifeq ($(shell test `rpm --eval '0%{?rhel}'` -gt 0 -a `rpm --eval '0%{?rhel}'` -lt 8 && echo 1),1) - $(APPLY) $(SRC)/jaeger-client-cpp/CMakeLists.txt.suppress-gcc-version-check.patch -endif -endif - $(MOVE) - -DEPS_jaeger-client-cpp = opentracing-cpp $(DEPS_opentracing-cpp) thrift $(DEPS_thrift) - -# note the https://github.com/google/myanmar-tools/issues/42 -.jaeger-client-cpp: jaeger-client-cpp - cd $< && \ - mkdir -p .build && \ - cd .build && \ - OpenTracing_DIR=$(PREFIX)/usr/local/lib/cmake/OpenTracing \ - thrift_DIR=$(PREFIX)/usr/local/lib/cmake/thrift \ - $(CMAKE) \ - -DJAEGERTRACING_BUILD_EXAMPLES=OFF \ - -DBUILD_TESTING=OFF \ - -DJAEGERTRACING_PLUGIN=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DHUNTER_CONFIGURATION_TYPES=Release \ - -DOPENTRACING_INC=$(TOPSRC)/local/usr/local/include \ - ../ && \ - make $(_SMP_MFLAGS) - cd $< && install -s .build/libjaegertracing_plugin.so $(PREFIX)/ - touch $@ diff --git a/contrib/src/jaeger-client-cpp/SHA512SUMS b/contrib/src/jaeger-client-cpp/SHA512SUMS deleted file mode 100644 index 50db60b1..00000000 --- a/contrib/src/jaeger-client-cpp/SHA512SUMS +++ /dev/null @@ -1,4 +0,0 @@ -e2cd621a51f0e4d25ff67ddbe86f17f6ef976e36b99c489aebdd330616e641fd0e428d2301a394eaa8920d35619f2d6172c436e8b828f44bdbe39e290e1849f0 jaeger-client-cpp-0.6.0.tar.gz -ab66da778b639204e7848afec80cdaae0ed75010c4a009483ec5edde67929a4396f160b55163de142e80857cd9f518e678d23ccbe14aea4ed707be06a6d6550d jaeger-client-cpp-0.7.0.tar.gz -b81582806fcdd1aa5cd06204b88e31a553760986a4721db98fea4466167dc2b4c3d7bab19deeb3723493f105b42f148c9089a452d03085c78ae05e3dc40c6f23 jaeger-client-cpp-0.8.0.tar.gz -3a51221ec9d5ea2791d7ad72ca7d77a93a1df9dfebdfa883053dda2ae4beb55b6bb85c422433280d8462abc21dc8e2ea3788483b7ea732925fdaecd9c34575a0 jaeger-client-cpp-0.9.0.tar.gz diff --git a/contrib/src/jaeger-client-cpp/version b/contrib/src/jaeger-client-cpp/version deleted file mode 100644 index 7d6bafd9..00000000 --- a/contrib/src/jaeger-client-cpp/version +++ /dev/null @@ -1 +0,0 @@ -JAEGER_CLIENT_CPP_VERSION := 0.9.0 diff --git a/contrib/src/json/Makefile b/contrib/src/json/Makefile deleted file mode 100644 index 316416d0..00000000 --- a/contrib/src/json/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# json - -include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/version -JSON_URL := $(GITHUB)/nlohmann/json/archive/v$(JSON_VERSION).tar.gz - -PKGS += json - -$(TARBALLS)/json-$(JSON_VERSION).tar.gz: - $(call download_pkg,$(JSON_URL),json) - -.sum-json: json-$(JSON_VERSION).tar.gz - -json: json-$(JSON_VERSION).tar.gz .sum-json - $(UNPACK) - $(MOVE) - -.json: json - cd $< && \ - mkdir -p .build && \ - cd .build && \ - $(CMAKE) \ - ../ && \ - DESTDIR=$(PREFIX) make $(_SMP_MFLAGS) install - touch $@ diff --git a/contrib/src/json/SHA512SUMS b/contrib/src/json/SHA512SUMS deleted file mode 100644 index 699d2f23..00000000 --- a/contrib/src/json/SHA512SUMS +++ /dev/null @@ -1 +0,0 @@ -70097c9bcd7a91254acbd41b8b68a6aaa371fc2dd7011f472917f69f1e2d2986155a0339dad791699d542e4a3be44dc49ae72ff73d0ee0ea4b34183296ce19a0 json-3.11.2.tar.gz diff --git a/contrib/src/json/version b/contrib/src/json/version deleted file mode 100644 index 1af70d91..00000000 --- a/contrib/src/json/version +++ /dev/null @@ -1 +0,0 @@ -JSON_VERSION := 3.11.2 diff --git a/contrib/src/nginx-opentracing/Makefile b/contrib/src/nginx-opentracing/Makefile deleted file mode 100644 index 8cf13a0b..00000000 --- a/contrib/src/nginx-opentracing/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# nginx-opentracing - -include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/version -NGINX_OPENTRACING_URL := $(GITHUB)/opentracing-contrib/nginx-opentracing/archive/v$(NGINX_OPENTRACING_VERSION).tar.gz - -PKGS += nginx-opentracing - -$(TARBALLS)/nginx-opentracing-$(NGINX_OPENTRACING_VERSION).tar.gz: - $(call download_pkg,$(NGINX_OPENTRACING_URL),nginx-opentracing) - -.sum-nginx-opentracing: nginx-opentracing-$(NGINX_OPENTRACING_VERSION).tar.gz - -nginx-opentracing: nginx-opentracing-$(NGINX_OPENTRACING_VERSION).tar.gz .sum-nginx-opentracing - $(UNPACK) - $(MOVE) - -DEPS_nginx-opentracing = opentracing-cpp $(DEPS_opentracing-cpp) - -.nginx-opentracing: nginx-opentracing - touch $@ diff --git a/contrib/src/nginx-opentracing/SHA512SUMS b/contrib/src/nginx-opentracing/SHA512SUMS deleted file mode 100644 index 41403b53..00000000 --- a/contrib/src/nginx-opentracing/SHA512SUMS +++ /dev/null @@ -1 +0,0 @@ -5ae04807bf3b1255d0737ce0283d9b6b7d9eeb1035057019b138636b3492dfddd60a5c6c31449f020ab464bd99ea5d908f5ac607a31f6a386379375e67c3737a nginx-opentracing-0.36.0.tar.gz diff --git a/contrib/src/nginx-opentracing/version b/contrib/src/nginx-opentracing/version deleted file mode 100644 index 472b8ed7..00000000 --- a/contrib/src/nginx-opentracing/version +++ /dev/null @@ -1 +0,0 @@ -NGINX_OPENTRACING_VERSION := 0.36.0 diff --git a/contrib/src/opentracing-cpp/CMakeLists.txt.patch b/contrib/src/opentracing-cpp/CMakeLists.txt.patch deleted file mode 100644 index 9a392e59..00000000 --- a/contrib/src/opentracing-cpp/CMakeLists.txt.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2019-09-18 21:59:25.000000000 +0000 -+++ b/CMakeLists.txt 2020-12-10 14:14:05.462435162 +0000 -@@ -180,7 +180,7 @@ - target_link_libraries(opentracing-static ${LIBRARIES}) - # Windows generates a lib and dll files for a shared library. using the same name will override the lib file generated by the shared target - if (NOT WIN32) -- set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing) -+ set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing POSITION_INDEPENDENT_CODE ON) - endif() - target_compile_definitions(opentracing-static PUBLIC OPENTRACING_STATIC) - target_include_directories(opentracing-static INTERFACE "$") diff --git a/contrib/src/opentracing-cpp/Makefile b/contrib/src/opentracing-cpp/Makefile deleted file mode 100644 index a4fb6af1..00000000 --- a/contrib/src/opentracing-cpp/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# opentracing-cpp - -include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/version -OPENTRACING_CPP_URL := $(GITHUB)/opentracing/opentracing-cpp/archive/v$(OPENTRACING_CPP_VERSION).tar.gz - -PKGS += opentracing-cpp - -$(TARBALLS)/opentracing-cpp-$(OPENTRACING_CPP_VERSION).tar.gz: - $(call download_pkg,$(OPENTRACING_CPP_URL),opentracing-cpp) - -.sum-opentracing-cpp: opentracing-cpp-$(OPENTRACING_CPP_VERSION).tar.gz - -opentracing-cpp: opentracing-cpp-$(OPENTRACING_CPP_VERSION).tar.gz .sum-opentracing-cpp - $(UNPACK) - $(APPLY) $(SRC)/opentracing-cpp/CMakeLists.txt.patch - $(APPLY) $(SRC)/opentracing-cpp/fix-ftbfs-glibc-2.34.patch - $(MOVE) - -.opentracing-cpp: opentracing-cpp - cd $< && \ - mkdir -p .build && \ - cd .build && \ - $(CMAKE) ../ && \ - DESTDIR=$(PREFIX) make $(_SMP_MFLAGS) install - touch $@ diff --git a/contrib/src/opentracing-cpp/SHA512SUMS b/contrib/src/opentracing-cpp/SHA512SUMS deleted file mode 100644 index 359ceba6..00000000 --- a/contrib/src/opentracing-cpp/SHA512SUMS +++ /dev/null @@ -1 +0,0 @@ -e4efad670d5f09e7ce2e1cd4820c7efdd12d8ffbc2f9cbeb54427f640922aa547e12cf01ae0066f5b89304c7f592ab2c2612139bf3275b19773028f1d8c159b5 opentracing-cpp-1.6.0.tar.gz diff --git a/contrib/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch b/contrib/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch deleted file mode 100644 index 7adb3f6b..00000000 --- a/contrib/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch +++ /dev/null @@ -1,42 +0,0 @@ -Author: Sergio Durigan Junior -Forwarded: yes, https://github.com/opentracing/opentracing-cpp/pull/142 -Last-Update: 2021-11-19 - -Index: opentracing-cpp-1.6.0/3rd_party/include/opentracing/catch2/catch.hpp -=================================================================== ---- opentracing-cpp-1.6.0.orig/3rd_party/include/opentracing/catch2/catch.hpp 2021-11-19 20:01:32.336577631 -0500 -+++ opentracing-cpp-1.6.0/3rd_party/include/opentracing/catch2/catch.hpp 2021-11-19 20:12:17.853232501 -0500 -@@ -6462,7 +6462,7 @@ - static bool isSet; - static struct sigaction oldSigActions[];// [sizeof(signalDefs) / sizeof(SignalDefs)]; - static stack_t oldSigStack; -- static char altStackMem[]; -+ static char *altStackMem; - - static void handleSignal( int sig ); - -@@ -6594,6 +6594,7 @@ - } - - FatalConditionHandler::FatalConditionHandler() { -+ altStackMem = new(char[SIGSTKSZ]); - isSet = true; - stack_t sigStack; - sigStack.ss_sp = altStackMem; -@@ -6610,6 +6611,7 @@ - } - - FatalConditionHandler::~FatalConditionHandler() { -+ delete[] altStackMem; - reset(); - } - -@@ -6628,7 +6630,7 @@ - bool FatalConditionHandler::isSet = false; - struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {}; - stack_t FatalConditionHandler::oldSigStack = {}; -- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {}; -+ char *FatalConditionHandler::altStackMem; - - } // namespace Catch - diff --git a/contrib/src/opentracing-cpp/version b/contrib/src/opentracing-cpp/version deleted file mode 100644 index 379967a4..00000000 --- a/contrib/src/opentracing-cpp/version +++ /dev/null @@ -1 +0,0 @@ -OPENTRACING_CPP_VERSION := 1.6.0 diff --git a/contrib/src/thrift/0001-Partially-revert-THRIFT-4861-Set-minimum-boost-to-1..patch b/contrib/src/thrift/0001-Partially-revert-THRIFT-4861-Set-minimum-boost-to-1..patch deleted file mode 100644 index d59eb3b8..00000000 --- a/contrib/src/thrift/0001-Partially-revert-THRIFT-4861-Set-minimum-boost-to-1..patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3e49a0e0d3557aa1737e2bbd974883245b82b9ae Mon Sep 17 00:00:00 2001 -From: Konstantin Pavlov -Date: Wed, 22 Nov 2023 13:34:29 -0800 -Subject: [PATCH] Partially revert "THRIFT-4861: Set minimum boost to 1.56 and - stop using deprecated boost predef endian header" - -This reverts parts of commit ee8caca54ef51e05c7eee8d67e3c63cd73081e8a. ---- - build/cmake/BoostMacros.cmake | 2 +- - lib/cpp/src/thrift/protocol/TProtocol.h | 17 +++++++---------- - 2 files changed, 8 insertions(+), 11 deletions(-) - -diff --git a/build/cmake/BoostMacros.cmake b/build/cmake/BoostMacros.cmake -index ffb85af32..c99073885 100644 ---- a/build/cmake/BoostMacros.cmake -+++ b/build/cmake/BoostMacros.cmake -@@ -17,7 +17,7 @@ - # under the License. - # - --set(BOOST_MINREV 1.56) -+set(BOOST_MINREV 1.53) - - macro(REQUIRE_BOOST_HEADERS) - find_package(Boost ${BOOST_MINREV} QUIET REQUIRED) -diff --git a/lib/cpp/src/thrift/protocol/TProtocol.h b/lib/cpp/src/thrift/protocol/TProtocol.h -index c6ff36049..e1241c86b 100644 ---- a/lib/cpp/src/thrift/protocol/TProtocol.h -+++ b/lib/cpp/src/thrift/protocol/TProtocol.h -@@ -106,18 +106,15 @@ static inline To bitwise_cast(From from) { - # define __THRIFT_LITTLE_ENDIAN LITTLE_ENDIAN - # define __THRIFT_BIG_ENDIAN BIG_ENDIAN - # else --# include --# if BOOST_ENDIAN_BIG_BYTE --# define __THRIFT_BYTE_ORDER 4321 --# define __THRIFT_LITTLE_ENDIAN 0 --# define __THRIFT_BIG_ENDIAN __THRIFT_BYTE_ORDER --# elif BOOST_ENDIAN_LITTLE_BYTE --# define __THRIFT_BYTE_ORDER 1234 --# define __THRIFT_LITTLE_ENDIAN __THRIFT_BYTE_ORDER --# define __THRIFT_BIG_ENDIAN 0 --# endif -+# include -+# include -+# define __THRIFT_BYTE_ORDER BOOST_BYTE_ORDER - # ifdef BOOST_LITTLE_ENDIAN -+# define __THRIFT_LITTLE_ENDIAN __THRIFT_BYTE_ORDER -+# define __THRIFT_BIG_ENDIAN 0 - # else -+# define __THRIFT_LITTLE_ENDIAN 0 -+# define __THRIFT_BIG_ENDIAN __THRIFT_BYTE_ORDER - # endif - # endif - #endif --- -2.39.3 (Apple Git-145) - diff --git a/contrib/src/thrift/0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch b/contrib/src/thrift/0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch deleted file mode 100644 index da4b5e2b..00000000 --- a/contrib/src/thrift/0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 25c75dcc1d911c3b97231e22fffa94da7bccb2bd Mon Sep 17 00:00:00 2001 -From: Konstantin Pavlov -Date: Wed, 22 Nov 2023 13:46:29 -0800 -Subject: [PATCH] Fixed build with GCC 4.8.5 on RHEL 7. - ---- - lib/cpp/src/thrift/transport/TBufferTransports.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/cpp/src/thrift/transport/TBufferTransports.h b/lib/cpp/src/thrift/transport/TBufferTransports.h -index 8518800a4..e74143243 100644 ---- a/lib/cpp/src/thrift/transport/TBufferTransports.h -+++ b/lib/cpp/src/thrift/transport/TBufferTransports.h -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.46.1 - diff --git a/contrib/src/thrift/Makefile b/contrib/src/thrift/Makefile deleted file mode 100644 index 46931f2b..00000000 --- a/contrib/src/thrift/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# thrift - -include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/version -THRIFT_URL := $(GITHUB)/apache/thrift/archive/v$(THRIFT_VERSION).tar.gz - -PKGS += thrift - -$(TARBALLS)/thrift-$(THRIFT_VERSION).tar.gz: - $(call download_pkg,$(THRIFT_URL),thrift) - -.sum-thrift: thrift-$(THRIFT_VERSION).tar.gz - -# patches reflect changes made in hunter version of thrift -thrift: thrift-$(THRIFT_VERSION).tar.gz .sum-thrift - $(UNPACK) - $(MOVE) - -.thrift: thrift - cd $< && \ - mkdir -p .build && \ - cd .build && \ - $(CMAKE) \ - -DBUILD_TESTING=OFF \ - -DBUILD_TUTORIALS=OFF \ - -DBUILD_COMPILER=OFF \ - -DBUILD_C_GLIB=OFF \ - -DBUILD_HASKELL=OFF \ - -DBUILD_JAVA=OFF \ - -DBUILD_PYTHON=OFF \ - -DWITH_QT4=OFF \ - -DWITH_QT5=OFF \ - -DWITH_SHARED_LIB=OFF \ - -DWITH_PLUGIN=OFF \ - -DWITH_LIBEVENT=OFF \ - -DWITH_OPENSSL=OFF \ - -DWITH_ZLIB=OFF \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_INSTALL_LIBDIR=lib \ - ../ && \ - DESTDIR=$(PREFIX) make $(_SMP_MFLAGS) install - touch $@ diff --git a/contrib/src/thrift/SHA512SUMS b/contrib/src/thrift/SHA512SUMS deleted file mode 100644 index e06a0fe9..00000000 --- a/contrib/src/thrift/SHA512SUMS +++ /dev/null @@ -1,2 +0,0 @@ -39566b7ecae7ae159822ee1c2c03a7af9ba6e228c3bbecea4079bdbd2332b42f03f79af08303a2685d04723f996d230cf95e5afc4d2a3880158a80429e21c190 thrift-0.21.0.tar.gz - diff --git a/contrib/src/thrift/version b/contrib/src/thrift/version deleted file mode 100644 index 4ba339a4..00000000 --- a/contrib/src/thrift/version +++ /dev/null @@ -1 +0,0 @@ -THRIFT_VERSION := 0.21.0 diff --git a/debian/Makefile b/debian/Makefile index 89772506..43a75f7f 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -368,9 +368,6 @@ test: base nginx-tests if [ -d $$pwd/module-perl ]; then \ globals="$$globals env PERL5LIB=$$pwd/debuild-module-perl/$(SRCDIR)/debian/build-nginx/objs/src/http/modules/perl:$$pwd/debuild-module-perl/$(SRCDIR)/debian/build-nginx/objs/src/http/modules/perl/blib/arch;" ; \ fi ; \ - if [ -d $$pwd/module-opentracing ]; then \ - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$pwd/debuild-module-opentracing/$(SRCDIR)/debian/build-nginx/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib ; \ - fi ; \ if [ -d $$pwd/module-lua ]; then \ globals_http="lua_package_path '$$pwd/debuild-module-lua/$(SRCDIR)/debian/extra/lua-resty-core-$(LUA_RESTY_CORE_VERSION)/lib/?.lua;$$pwd/debuild-module-lua/$(SRCDIR)/debian/extra/lua-resty-lrucache-$(LUA_RESTY_LRUCACHE_VERSION)/lib/?.lua;;';" ; \ globals_stream="$$globals_http" ; \ @@ -391,9 +388,6 @@ test-debug: base nginx-tests if [ -d $$pwd/module-perl ]; then \ globals="$$globals env PERL5LIB=$$pwd/debuild-module-perl/$(SRCDIR)/debian/build-nginx-debug/objs/src/http/modules/perl:$$pwd/debuild-module-perl/$(SRCDIR)/debian/build-nginx/objs/src/http/modules/perl/blib/arch;" ; \ fi ; \ - if [ -d $$pwd/module-opentracing ]; then \ - export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$$pwd/debuild-module-opentracing/$(SRCDIR)/debian/build-nginx-debug/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib ; \ - fi ; \ if [ -d $$pwd/module-lua ]; then \ globals_http="lua_package_path '$$pwd/debuild-module-lua/$(SRCDIR)/debian/extra/lua-resty-core-$(LUA_RESTY_CORE_VERSION)/lib/?.lua;$$pwd/debuild-module-lua/$(SRCDIR)/debian/extra/lua-resty-lrucache-$(LUA_RESTY_LRUCACHE_VERSION)/lib/?.lua;;';" ; \ globals_stream="$$globals_http" ; \ diff --git a/debian/Makefile.module-opentracing b/debian/Makefile.module-opentracing deleted file mode 100644 index 21819284..00000000 --- a/debian/Makefile.module-opentracing +++ /dev/null @@ -1,144 +0,0 @@ -MODULES+= opentracing - -MODULE_SUMMARY_opentracing= 3rd-party OpenTracing dynamic module - -include $(CONTRIB)/src/opentracing-cpp/version -include $(CONTRIB)/src/nginx-opentracing/version -include $(CONTRIB)/src/thrift/version -include $(CONTRIB)/src/json/version -include $(CONTRIB)/src/jaeger-client-cpp/version - -MODULE_VERSION_opentracing= $(NGINX_OPENTRACING_VERSION) -MODULE_RELEASE_opentracing= 1 - -MODULE_VERSION_PREFIX_opentracing=$(MODULE_TARGET_PREFIX) - -MODULE_SOURCES_opentracing= opentracing-cpp-$(OPENTRACING_CPP_VERSION).tar.gz \ - nginx-opentracing-$(NGINX_OPENTRACING_VERSION).tar.gz \ - json-$(JSON_VERSION).tar.gz \ - thrift-$(THRIFT_VERSION).tar.gz \ - jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION).tar.gz - -MODULE_PATCHES_opentracing= $(CONTRIB)/src/opentracing-cpp/CMakeLists.txt.patch \ - $(CONTRIB)/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch \ - $(CONTRIB)/src/jaeger-client-cpp/CMakeLists.txt.patch - -MODULE_CONFARGS_opentracing= --add-dynamic-module=$(MODSRC_PREFIX)nginx-opentracing-$(NGINX_OPENTRACING_VERSION)/opentracing - -.deps-module-opentracing: - cd $(CONTRIB) && make \ - .sum-opentracing-cpp \ - .sum-nginx-opentracing \ - .sum-json \ - .sum-thrift \ - .sum-jaeger-client-cpp - touch $@ - -MODULE_BUILD_DEPENDS_opentracing=,cmake,libyaml-cpp-dev,libboost-dev - -define MODULE_PREBUILD_opentracing - cd $$(BUILDDIR_nginx)/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION) \&\& \ - mkdir .build \&\& \ - cd .build \&\& \ - cmake ../ \&\& \ - DESTDIR=$$(BUILDDIR_nginx)/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION) \ - $$(MAKE) -j$$(NUMJOBS) install - cd $$(BUILDDIR_nginx)/extra/thrift-$(THRIFT_VERSION) \&\& \ - mkdir .build \&\& \ - cd .build \&\& \ - cmake \ - -DBUILD_TESTING=OFF \ - -DBUILD_TUTORIALS=OFF \ - -DBUILD_COMPILER=OFF \ - -DBUILD_C_GLIB=OFF \ - -DBUILD_JAVA=OFF \ - -DBUILD_JAVASCRIPT=OFF \ - -DBUILD_NODEJS=OFF \ - -DBUILD_PYTHON=OFF \ - -DWITH_QT5=OFF \ - -DWITH_SHARED_LIB=OFF \ - -DWITH_LIBEVENT=OFF \ - -DWITH_OPENSSL=OFF \ - -DWITH_ZLIB=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_INSTALL_PREFIX:STRING=$$(BUILDDIR_nginx)/extra/thrift-$(THRIFT_VERSION) \ - ../ \&\& \ - $$(MAKE) -j$$(NUMJOBS) install \&\& \ - ln -sf ThriftConfig.cmake $$(BUILDDIR_nginx)/extra/thrift-$(THRIFT_VERSION)/lib/cmake/thrift/thriftConfig.cmake \&\& \ - mkdir -p $$(BUILDDIR_nginx)/extra/thrift-$(THRIFT_VERSION)/bin/ - cd $$(BUILDDIR_nginx)/extra/json-$(JSON_VERSION) \&\& \ - mkdir .build \&\& \ - cd .build \&\& \ - cmake \ - -DJSON_BuildTests=OFF \ - -DJSON_BuildTests_INIT=OFF \ - -DJSON_Install=ON \ - -DCMAKE_INSTALL_PREFIX:STRING=$$(BUILDDIR_nginx)/extra/json-$(JSON_VERSION) \ - ../ \&\& \ - $$(MAKE) -j$$(NUMJOBS) install - cd $$(BUILDDIR_nginx)/extra/jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION) \&\& \ - mkdir .build \&\& \ - cd .build \&\& \ - OpenTracing_DIR=$$(BUILDDIR_nginx)/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib/cmake/OpenTracing \ - thrift_DIR=$$(BUILDDIR_nginx)/extra/thrift-$(THRIFT_VERSION)/lib/cmake/thrift \ - nlohmann_json_DIR=$$(BUILDDIR_nginx)/extra/json-$(JSON_VERSION)/share/cmake/nlohmann_json \ - cmake \ - -DJAEGERTRACING_BUILD_EXAMPLES=OFF \ - -DBUILD_TESTING=OFF \ - -DJAEGERTRACING_PLUGIN=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DHUNTER_ENABLED=OFF \ - -DOPENTRACING_INC=$$(BUILDDIR_nginx)/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/include \ - ../ \&\& \ - $$(MAKE) -j$$(NUMJOBS) -endef -export MODULE_PREBUILD_opentracing - -MODULE_CC_OPT_opentracing=-I$$\(BUILDDIR_nginx\)/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/include -MODULE_CC_OPT_DEBUG_opentracing=$(MODULE_CC_OPT_opentracing) -MODULE_LD_OPT_opentracing=-L$$\(BUILDDIR_nginx\)/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib -MODULE_LD_OPT_DEBUG_opentracing=$(MODULE_LD_OPT_opentracing) - -define MODULE_PREINSTALL_opentracing - mkdir -p $$(INSTALLDIR)/usr/lib/$$(DEB_HOST_MULTIARCH) - install -m755 $$(BUILDDIR_nginx)/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib/libopentracing.so.$(OPENTRACING_CPP_VERSION) $$(INSTALLDIR)/usr/lib/$$(DEB_HOST_MULTIARCH) - ln -fs libopentracing.so.$(OPENTRACING_CPP_VERSION) $$(INSTALLDIR)/usr/lib/$$(DEB_HOST_MULTIARCH)/libopentracing.so.1 - ln -fs libopentracing.so.1 $$(INSTALLDIR)/usr/lib/$$(DEB_HOST_MULTIARCH)/libopentracing.so - install -m755 $$(BUILDDIR_nginx)/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib/libopentracing_mocktracer.so.$(OPENTRACING_CPP_VERSION) $$(INSTALLDIR)/usr/lib/$$(DEB_HOST_MULTIARCH) - ln -fs libopentracing_mocktracer.so.$(OPENTRACING_CPP_VERSION) $$(INSTALLDIR)/usr/lib/$$(DEB_HOST_MULTIARCH)/libopentracing_mocktracer.so.1 - ln -fs libopentracing_mocktracer.so.1 $$(INSTALLDIR)/usr/lib/$$(DEB_HOST_MULTIARCH)/libopentracing_mocktracer.so - mkdir -p $$(INSTALLDIR)/usr/include - cp -pr $$(BUILDDIR_nginx)/extra/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/include/opentracing $$(INSTALLDIR)/usr/include/ - mkdir -p $$(INSTALLDIR)/usr/libexec/opentracing - install -m755 $$(BUILDDIR_nginx)/extra/jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION)/.build/libjaegertracing_plugin.so $$(INSTALLDIR)/usr/libexec/opentracing/ -endef -export MODULE_PREINSTALL_opentracing - -define MODULE_POST_opentracing -cat < - - - - - - - - - -Updated nginx-opentracing to 0.36.0. - - - - -Updated thrift to 0.21.0. - - - - - - - -base version updated to 1.27.2-1 - - - - - - - - - -base version updated to 1.27.1-1 - - - - - - - - - -base version updated to 1.27.0-2 - - - - - - - - - -base version updated to 1.27.0-1 - - - - - - - - - -base version updated to 1.25.5-1 - - - - - - - - - -base version updated to 1.25.4-1 - - - - - - - - - -Updated nginx-opentracing to 0.27.0 - - - - -Updated thrift to 0.19.0 - - - - - - - - - -base version updated to 1.25.3-1 - - - - - - - - - -base version updated to 1.25.2-1 - - - - - - - - - -base version updated to 1.25.1-1 - - - - - - - - - -base version updated to 1.25.0-1 - - - - - - - - - -Updated nginx-opentracing to 0.29.0 - - - - - - - - -base version updated to 1.23.4-1 - - - - - - - - - -base version updated to 1.23.3-1 - - - - - - - - - -Updated nginx-opentracing to 0.27.0 - - - - - - - - - -base version updated to 1.23.2-1 - - - - - - - - - -base version updated to 1.23.1-1 - - - - - - - - - -base version updated to 1.23.0-1 - - - - - - - - - -Updated jaeger-cpp to 0.9.0 - - - - - -Updated nginx-opentracing to 0.24.0 - - - - - - - - - -nginx-opentracing module update to 0.23.0 - - - - - - - - - -base version updated to 1.21.6-1 - - - - - - - - - -base version updated to 1.21.5-1 - - - - - - - - - -nginx-opentracing module updated to 0.22.1 - - - - - -Jaeger tracer plugin updated to 0.8.0 - - - - - - - - - -base version updated to 1.21.4-1 - - - - - - - - - -base version updated to 1.21.3-1 - - - - - - - - - -base version updated to 1.21.2-1 - - - - - - - - - -base version updated to 1.21.1-1 - - - - - - - - - -base version updated to 1.21.0-1 - - - - - - - - - -base version updated to 1.19.10-1 - - - - - - - - - -base version updated to 1.19.9-1 - - - - - - - - - -nginx-opentracing module updated to 0.14.0 - - - - - - - - - -base version updated to 1.19.8-1 - - - - - - - - - -base version updated to 1.19.7-1 - - - - - - - - - - -Initial release of OpenTracing nginx module package. - - - - - - - diff --git a/rpm/SPECS/Makefile b/rpm/SPECS/Makefile index 5679565d..8188621f 100644 --- a/rpm/SPECS/Makefile +++ b/rpm/SPECS/Makefile @@ -361,26 +361,6 @@ check-compat-%: exit ; \ fi ; \ ;; \ - opentracing) \ - if [ "`rpm --eval '0%{?suse_version}'`" -gt 0 -a "`rpm --eval '0%{?suse_version}'`" -lt 1500 ]; then \ - echo "OpenTracing can not be built on SLES < 15 due to absence of yaml-cpp" > \ - nginx-module-$${module}.skip ; \ - exit ; \ - fi ; \ - if [ "`rpm --eval '%{_arch}'`" = "ppc64le" ]; then \ - echo "OpenTracing can not be built on ppc64le" > \ - nginx-module-$${module}.skip ; \ - exit ; \ - fi ; \ - if [ `rpm --eval '0%{?rhel}'` -gt 0 ]; then \ - cmake3 -version >/dev/null 2>&1 ; \ - if [ $$? -ne 0 ]; then \ - echo "OpenTracing requires cmake3 on RHEL/CentOS" > \ - nginx-module-$${module}.skip ; \ - fi ; \ - exit ; \ - fi ; \ - ;; \ esac nginx-tests: @@ -407,9 +387,6 @@ test: base nginx-tests if [ -d $$pwd/module-perl ]; then \ globals="$$globals env PERL5LIB=$$pwd/module-perl/src/http/modules/perl:$$pwd/module-perl/src/http/modules/perl/blib/arch;" ; \ fi ; \ - if [ -d $$pwd/module-opentracing ]; then \ - export LD_LIBRARY_PATH=$$pwd/module-opentracing/../opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib:$$LD_LIBRARY_PATH ; \ - fi ; \ if [ -d $$pwd/module-lua ]; then \ globals_http="lua_package_path '$$pwd/../BUILD/$(MODULE_PACKAGE_PREFIX)-lua-$(BASE_VERSION)/lua-resty-core-$(LUA_RESTY_CORE_VERSION)/lib/?.lua;$$pwd/../BUILD/$(MODULE_PACKAGE_PREFIX)-lua-$(BASE_VERSION)/lua-resty-lrucache-$(LUA_RESTY_LRUCACHE_VERSION)/lib/?.lua;;';" ; \ globals_stream="$$globals_http" ; \ @@ -430,9 +407,6 @@ test-debug: base nginx-tests if [ -d $$pwd/module-perl ]; then \ globals="$$globals env PERL5LIB=$$pwd/module-perl/src/http/modules/perl:$$pwd/module-perl/src/http/modules/perl/blib/arch;" ; \ fi ; \ - if [ -d $$pwd/module-opentracing ]; then \ - export LD_LIBRARY_PATH=$$pwd/module-opentracing/../opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib ; \ - fi ; \ if [ -d $$pwd/module-lua ]; then \ globals_http="lua_package_path '$$pwd/../BUILD/$(MODULE_PACKAGE_PREFIX)-lua-$(BASE_VERSION)/lua-resty-core-$(LUA_RESTY_CORE_VERSION)/lib/?.lua;$$pwd/../BUILD/$(MODULE_PACKAGE_PREFIX)-lua-$(BASE_VERSION)/lua-resty-lrucache-$(LUA_RESTY_LRUCACHE_VERSION)/lib/?.lua;;';" ; \ globals_stream="$$globals_http" ; \ diff --git a/rpm/SPECS/Makefile.module-opentracing b/rpm/SPECS/Makefile.module-opentracing deleted file mode 100644 index 29fdfce6..00000000 --- a/rpm/SPECS/Makefile.module-opentracing +++ /dev/null @@ -1,186 +0,0 @@ -MODULES+= opentracing - -MODULE_SUMMARY_opentracing= 3rd-party OpenTracing dynamic module - -include $(CONTRIB)/src/opentracing-cpp/version -include $(CONTRIB)/src/nginx-opentracing/version -include $(CONTRIB)/src/thrift/version -include $(CONTRIB)/src/json/version -include $(CONTRIB)/src/jaeger-client-cpp/version - -MODULE_VERSION_opentracing= $(NGINX_OPENTRACING_VERSION) -MODULE_RELEASE_opentracing= 1 - -MODULE_VERSION_PREFIX_opentracing=$(MODULE_TARGET_PREFIX) - -MODULE_SOURCES_opentracing= opentracing-cpp-$(OPENTRACING_CPP_VERSION).tar.gz \ - nginx-opentracing-$(NGINX_OPENTRACING_VERSION).tar.gz \ - thrift-$(THRIFT_VERSION).tar.gz \ - json-$(JSON_VERSION).tar.gz \ - jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION).tar.gz - -MODULE_PATCHES_opentracing= $(CONTRIB)/src/opentracing-cpp/CMakeLists.txt.patch \ - $(CONTRIB)/src/opentracing-cpp/fix-ftbfs-glibc-2.34.patch \ - $(CONTRIB)/src/jaeger-client-cpp/CMakeLists.txt.patch - -ifeq ($(shell test `rpm --eval '0%{?rhel}'` -gt 0 -a `rpm --eval '0%{?rhel}'` -lt 8 && echo 1),1) -MODULE_PATCHES_opentracing+= $(CONTRIB)/src/jaeger-client-cpp/CMakeLists.txt.suppress-gcc-version-check.patch \ - $(CONTRIB)/src/thrift/0001-Partially-revert-THRIFT-4861-Set-minimum-boost-to-1..patch \ - $(CONTRIB)/src/thrift//0002-Fixed-build-with-GCC-4.8.5-on-RHEL-7.patch -endif - -MODULE_CONFARGS_opentracing= --add-dynamic-module=nginx-opentracing-$(NGINX_OPENTRACING_VERSION)/opentracing - -.deps-module-opentracing: - cd $(CONTRIB) && make \ - .sum-opentracing-cpp \ - .sum-nginx-opentracing \ - .sum-thrift \ - .sum-json \ - .sum-jaeger-client-cpp - touch $@ - -define MODULE_DEFINITIONS_opentracing -%if (0%{?rhel} > 0) || (0%{?amzn} > 0) -%if (0%{?rhel} >= 8) -BuildRequires: cmake -%define _cmake_cmd %{__cmake} -%else -BuildRequires: cmake3 -%define _cmake_cmd %{__cmake3} -%endif -%endif - -%if (0%{?suse_version} >= 1500) || (0%{?fedora} > 0) -BuildRequires: cmake -%define _cmake_cmd %{__cmake} -%endif -%if (0%{?rhel} >= 7) || (0%{?fedora} > 0) -BuildRequires: libstdc++-static -%endif -BuildRequires: yaml-cpp-devel -BuildRequires: boost-devel -endef -export MODULE_DEFINITIONS_opentracing - -MODULE_CC_OPT_opentracing=-I%{bdir}/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/include -MODULE_CC_OPT_DEBUG_opentracing=$(MODULE_CC_OPT_opentracing) -MODULE_LD_OPT_opentracing=-L%{bdir}/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib -MODULE_LD_OPT_DEBUG_opentracing=$(MODULE_LD_OPT_opentracing) - -define MODULE_PREBUILD_opentracing -cd %{bdir}/opentracing-cpp-$(OPENTRACING_CPP_VERSION) \&\& \ -mkdir .build \&\& \ -cd .build \&\& \ -%{_cmake_cmd} ../ \&\& \ -DESTDIR=%{bdir}/opentracing-cpp-$(OPENTRACING_CPP_VERSION) make %{?_smp_mflags} install || exit 1 -cd %{bdir}/thrift-$(THRIFT_VERSION) \&\& \ -mkdir .build \&\& \ -cd .build \&\& \ -%{_cmake_cmd} \ - -DBUILD_TESTING=OFF \ - -DBUILD_TUTORIALS=OFF \ - -DBUILD_COMPILER=OFF \ - -DBUILD_C_GLIB=OFF \ - -DBUILD_JAVA=OFF \ - -DBUILD_JAVASCRIPT=OFF \ - -DBUILD_NODEJS=OFF \ - -DBUILD_PYTHON=OFF \ - -DWITH_QT5=OFF \ - -DWITH_SHARED_LIB=OFF \ - -DWITH_LIBEVENT=OFF \ - -DWITH_OPENSSL=OFF \ - -DWITH_ZLIB=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DCMAKE_INSTALL_PREFIX:STRING=%{bdir}/thrift-$(THRIFT_VERSION) \ -../ \&\& \ -make %{?_smp_mflags} install \&\& \ -ln -sf ThriftConfig.cmake %{bdir}/thrift-$(THRIFT_VERSION)/lib/cmake/thrift/thriftConfig.cmake \&\& \ -mkdir -p %{bdir}/thrift-$(THRIFT_VERSION)/bin/ || exit 1 -cd %{bdir}/json-$(JSON_VERSION) \&\& \ -mkdir .build \&\& \ -cd .build \&\& \ -%{_cmake_cmd} \ - -DJSON_BuildTests=OFF \ - -DJSON_BuildTests_INIT=OFF \ - -DJSON_Install=ON \ - -DCMAKE_INSTALL_PREFIX:STRING=%{bdir}/json-$(JSON_VERSION) \ -../ \&\& \ -make %{?_smp_mflags} install || exit 1 -cd %{bdir}/jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION) \&\& \ -mkdir .build \&\& \ -cd .build \&\& \ -OpenTracing_DIR=%{bdir}/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib/cmake/OpenTracing \ -thrift_DIR=%{bdir}/thrift-$(THRIFT_VERSION)/lib/cmake/thrift \ -nlohmann_json_DIR=%{bdir}/json-$(JSON_VERSION)/share/cmake/nlohmann_json \ -%{_cmake_cmd} \ - -DJAEGERTRACING_BUILD_EXAMPLES=OFF \ - -DBUILD_TESTING=OFF \ - -DJAEGERTRACING_PLUGIN=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DHUNTER_ENABLED=OFF \ - -DOPENTRACING_INC=%{bdir}/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/include \ -../ \&\& \ -make %{?_smp_mflags} || exit 1 -endef -export MODULE_PREBUILD_opentracing - -define MODULE_PREINSTALL_opentracing -%{__mkdir} -p $$RPM_BUILD_ROOT%{_libdir} -%{__install} -m755 %{bdir}/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib/libopentracing.so.$(OPENTRACING_CPP_VERSION) \ - $$RPM_BUILD_ROOT%{_libdir}/ -%{__install} -m755 %{bdir}/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/lib/libopentracing_mocktracer.so.$(OPENTRACING_CPP_VERSION) \ - $$RPM_BUILD_ROOT%{_libdir}/ -%{__ln_s} -f libopentracing.so.$(OPENTRACING_CPP_VERSION) $$RPM_BUILD_ROOT%{_libdir}/libopentracing.so.1 -%{__ln_s} -f libopentracing.so.1 $$RPM_BUILD_ROOT%{_libdir}/libopentracing.so -%{__ln_s} -f libopentracing_mocktracer.so.$(OPENTRACING_CPP_VERSION) $$RPM_BUILD_ROOT%{_libdir}/libopentracing_mocktracer.so.1 -%{__ln_s} -f libopentracing_mocktracer.so.1 $$RPM_BUILD_ROOT%{_libdir}/libopentracing_mocktracer.so -%{__mkdir} -p $$RPM_BUILD_ROOT%{_includedir} -%{__cp} -rp %{bdir}/opentracing-cpp-$(OPENTRACING_CPP_VERSION)/usr/local/include/opentracing $$RPM_BUILD_ROOT%{_includedir}/ -%{__mkdir} -p $$RPM_BUILD_ROOT%{_libexecdir}/opentracing -%{__install} -m755 %{bdir}/jaeger-client-cpp-$(JAEGER_CLIENT_CPP_VERSION)/.build/libjaegertracing_plugin.so $$RPM_BUILD_ROOT%{_libexecdir}/opentracing/ -endef -export MODULE_PREINSTALL_opentracing - -define MODULE_FILES_opentracing -%{_libdir}/libopentracing.so.$(OPENTRACING_CPP_VERSION) -%{_libdir}/libopentracing.so.1 -%{_libdir}/libopentracing.so -%{_libdir}/libopentracing_mocktracer.so.$(OPENTRACING_CPP_VERSION) -%{_libdir}/libopentracing_mocktracer.so.1 -%{_libdir}/libopentracing_mocktracer.so -%dir %{_libexecdir}/opentracing -%{_libexecdir}/opentracing/libjaegertracing_plugin.so -%dir %{_includedir}/opentracing -%{_includedir}/opentracing/* -endef -export MODULE_FILES_opentracing - -define MODULE_POST_opentracing -cat <