technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Packages: get rid of deprecated configure options.

Browse Source
This commit is contained in:
Konstantin Pavlov
2023-02-06 12:39:06 -08:00
parent 789762ff3d
commit b0bb829107
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/deb/Makefile
View File

@@ -117,11 +117,11 @@ endif
CONFIGURE_ARGS_COMMON=\ CONFIGURE_ARGS_COMMON=\
--prefix=/usr \ --prefix=/usr \
--state=/var/lib/unit \ --libstatedir=/var/lib/unit \
--control="unix:/var/run/control.unit.sock" \ --control="unix:/var/run/control.unit.sock" \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmp=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
--group=unit \ --group=unit \
--tests \ --tests \

4
pkg/deb/debian.module/rules-noarch.in
View File

@@ -35,7 +35,7 @@ configure.unit: config.env.unit
cd $(BUILDDIR_unit) && \ cd $(BUILDDIR_unit) && \
CFLAGS= ./configure \ CFLAGS= ./configure \
%%CONFIGURE_ARGS%% \ %%CONFIGURE_ARGS%% \
--modules=/usr/lib/unit/modules \ --modulesdir=/usr/lib/unit/modules \
--cc-opt="$(CFLAGS)" && \ --cc-opt="$(CFLAGS)" && \
./configure %%MODULE_CONFARGS%% ./configure %%MODULE_CONFARGS%%
touch $@ touch $@
@@ -44,7 +44,7 @@ configure.unit_debug: config.env.unit_debug
cd $(BUILDDIR_unit_debug) && \ cd $(BUILDDIR_unit_debug) && \
CFLAGS= ./configure \ CFLAGS= ./configure \
%%CONFIGURE_ARGS%% \ %%CONFIGURE_ARGS%% \
--modules=/usr/lib/unit/debug-modules \ --modulesdir=/usr/lib/unit/debug-modules \
--cc-opt="$(CFLAGS)" \ --cc-opt="$(CFLAGS)" \
--debug && \ --debug && \
./configure %%MODULE_CONFARGS%% ./configure %%MODULE_CONFARGS%%

4
pkg/deb/debian.module/rules.in
View File

@@ -35,7 +35,7 @@ configure.unit: config.env.unit
cd $(BUILDDIR_unit) && \ cd $(BUILDDIR_unit) && \
CFLAGS= ./configure \ CFLAGS= ./configure \
%%CONFIGURE_ARGS%% \ %%CONFIGURE_ARGS%% \
--modules=/usr/lib/unit/modules \ --modulesdir=/usr/lib/unit/modules \
--cc-opt="$(CFLAGS)" && \ --cc-opt="$(CFLAGS)" && \
./configure %%MODULE_CONFARGS%% ./configure %%MODULE_CONFARGS%%
touch $@ touch $@
@@ -44,7 +44,7 @@ configure.unit_debug: config.env.unit_debug
cd $(BUILDDIR_unit_debug) && \ cd $(BUILDDIR_unit_debug) && \
CFLAGS= ./configure \ CFLAGS= ./configure \
%%CONFIGURE_ARGS%% \ %%CONFIGURE_ARGS%% \
--modules=/usr/lib/unit/debug-modules \ --modulesdir=/usr/lib/unit/debug-modules \
--cc-opt="$(CFLAGS)" \ --cc-opt="$(CFLAGS)" \
--debug && \ --debug && \
./configure %%MODULE_CONFARGS%% ./configure %%MODULE_CONFARGS%%

4
pkg/deb/debian/rules.in
View File

@@ -48,7 +48,7 @@ configure.unit: config.env.unit
PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \ PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
CFLAGS= ./configure \ CFLAGS= ./configure \
%%CONFIGURE_ARGS%% \ %%CONFIGURE_ARGS%% \
--modules=/usr/lib/unit/modules \ --modulesdir=/usr/lib/unit/modules \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--cc-opt="$(CFLAGS)" \ --cc-opt="$(CFLAGS)" \
--ld-opt="$(LDFLAGS)" --ld-opt="$(LDFLAGS)"
@@ -59,7 +59,7 @@ configure.unit_debug: config.env.unit_debug
PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \ PKG_CONFIG_PATH=$(CURDIR)/pkg/contrib/njs/build \
CFLAGS= ./configure \ CFLAGS= ./configure \
%%CONFIGURE_ARGS%% \ %%CONFIGURE_ARGS%% \
--modules=/usr/lib/unit/debug-modules \ --modulesdir=/usr/lib/unit/debug-modules \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--cc-opt="$(CFLAGS)" \ --cc-opt="$(CFLAGS)" \
--ld-opt="$(LDFLAGS)" \ --ld-opt="$(LDFLAGS)" \

12
pkg/docker/template.Dockerfile
View File

@@ -14,28 +14,28 @@ RUN set -ex \
&& CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \ && CC_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_CFLAGS_MAINT_APPEND="-Wp,-D_FORTIFY_SOURCE=2 -fPIC" dpkg-buildflags --get CFLAGS)" \
&& LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \ && LD_OPT="$(DEB_BUILD_MAINT_OPTIONS="hardening=+all,-pie" DEB_LDFLAGS_MAINT_APPEND="-Wl,--as-needed -pie" dpkg-buildflags --get LDFLAGS)" \
&& CONFIGURE_ARGS="--prefix=/usr \ && CONFIGURE_ARGS="--prefix=/usr \
--state=/var/lib/unit \ --libstatedir=/var/lib/unit \
--control=unix:/var/run/control.unit.sock \ --control=unix:/var/run/control.unit.sock \
--pid=/var/run/unit.pid \ --pid=/var/run/unit.pid \
--log=/var/log/unit.log \ --log=/var/log/unit.log \
--tmp=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
--group=unit \ --group=unit \
--openssl \ --openssl \
--libdir=/usr/lib/$DEB_HOST_MULTIARCH" \ --libdir=/usr/lib/$DEB_HOST_MULTIARCH" \
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/unitd /usr/sbin/unitd-debug \ && install -pm755 build/unitd /usr/sbin/unitd-debug \
&& make clean \ && make clean \
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modules=/usr/lib/unit/modules \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --ld-opt="$LD_OPT" --modulesdir=/usr/lib/unit/modules \
&& make -j $NCPU unitd \ && make -j $NCPU unitd \
&& install -pm755 build/unitd /usr/sbin/unitd \ && install -pm755 build/unitd /usr/sbin/unitd \
&& make clean \ && make clean \
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/debug-modules --debug \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
&& ./configure @@CONFIGURE@@ \ && ./configure @@CONFIGURE@@ \
&& make -j $NCPU @@INSTALL@@ \ && make -j $NCPU @@INSTALL@@ \
&& make clean \ && make clean \
&& ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modules=/usr/lib/unit/modules \ && ./configure $CONFIGURE_ARGS --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
&& ./configure @@CONFIGURE@@ \ && ./configure @@CONFIGURE@@ \
&& make -j $NCPU @@INSTALL@@ \ && make -j $NCPU @@INSTALL@@ \
&& ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt && ldd /usr/sbin/unitd | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq > /requirements.apt

4
pkg/rpm/Makefile
View File

@@ -108,11 +108,11 @@ endif
CONFIGURE_ARGS_COMMON=\ CONFIGURE_ARGS_COMMON=\
--prefix=/usr \ --prefix=/usr \
--state=%{_sharedstatedir}/unit \ --libstatedir=%{_sharedstatedir}/unit \
--control="unix:/var/run/unit/control.sock" \ --control="unix:/var/run/unit/control.sock" \
--pid=/var/run/unit/unit.pid \ --pid=/var/run/unit/unit.pid \
--log=/var/log/unit/unit.log \ --log=/var/log/unit/unit.log \
--tmp=/var/tmp \ --tmpdir=/var/tmp \
--user=unit \ --user=unit \
--group=unit \ --group=unit \
--tests \ --tests \

4
pkg/rpm/unit.module.spec.in
View File

@@ -61,7 +61,7 @@ tar --strip-components=1 -zxf %{SOURCE0}
%build %build
./configure \ ./configure \
%{CONFIGURE_ARGS} \ %{CONFIGURE_ARGS} \
--modules=%{_libdir}/unit/debug-modules \ --modulesdir=%{_libdir}/unit/debug-modules \
--cc-opt="%{CC_OPT}" \ --cc-opt="%{CC_OPT}" \
--debug --debug
./configure %%MODULE_CONFARGS%% ./configure %%MODULE_CONFARGS%%
@@ -69,7 +69,7 @@ make %%MODULE_MAKEARGS%%
%{__mv} build build-debug %{__mv} build build-debug
./configure \ ./configure \
%{CONFIGURE_ARGS} \ %{CONFIGURE_ARGS} \
--modules=%{_libdir}/unit/modules \ --modulesdir=%{_libdir}/unit/modules \
--cc-opt="%{CC_OPT}" --cc-opt="%{CC_OPT}"
./configure %%MODULE_CONFARGS%% ./configure %%MODULE_CONFARGS%%
make %%MODULE_MAKEARGS%% make %%MODULE_MAKEARGS%%

4
pkg/rpm/unit.spec.in
View File

@@ -80,7 +80,7 @@ Library and include files required for NGINX Unit modules development.
PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \
./configure \ ./configure \
%{CONFIGURE_ARGS} \ %{CONFIGURE_ARGS} \
--modules=%{_libdir}/unit/debug-modules \ --modulesdir=%{_libdir}/unit/debug-modules \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
--cc-opt="%{CC_OPT}" \ --cc-opt="%{CC_OPT}" \
--ld-opt="%{LD_OPT}" \ --ld-opt="%{LD_OPT}" \
@@ -92,7 +92,7 @@ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \
PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \ PKG_CONFIG_PATH=%{bdir}/pkg/contrib/njs/build \
./configure \ ./configure \
%{CONFIGURE_ARGS} \ %{CONFIGURE_ARGS} \
--modules=%{_libdir}/unit/modules \ --modulesdir=%{_libdir}/unit/modules \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
--cc-opt="%{CC_OPT}" \ --cc-opt="%{CC_OPT}" \
--ld-opt="%{LD_OPT}" --ld-opt="%{LD_OPT}"