diff options
| author | Sam James <sam@cmpct.info> | 2022-01-18 13:30:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 14:30:14 +0100 |
| commit | c2b7d77784beeae5f86f19e33ba3da5ddce55898 (patch) | |
| tree | 3fc4f7fc31219e051afbca994274ee1c6f92112d /packages | |
| parent | e4a7990a4e4842b4e6f5b10fb51ab288fa340240 (diff) | |
build: respect environment options more (#1392)
* build: update m4/ax_pthread.m4 from serial 23 -> serial 31
Update ax_pthread.m4 to the latest version from the autoconf-archive
project.
Signed-off-by: Sam James <sam@gentoo.org>
* build: properly detect AR, CC, RANLIB
It's necessary to be able to override choice of AR/CC/RANLIB and other toolchain
variables/tools for cross-compilation, testing with other toolchains, and
to ensure the compiler chosen by the user is actually used for the build.
Previously, GNU_PREFIX was kind-of used for this but this isn't a standard
variable (at all) and it wasn't applied consistently anyway.
We now use the standard autoconf mechanisms for finding these tools.
(RANLIB is already covered by LT_INIT.)
Signed-off-by: Sam James <sam@gentoo.org>
* build: use $(MAKE)
This ensures that parallel make works correctly, as otherwise, a fresh
make job will be started without the jobserver fd, and hence
not know about its parent, forcing -j1.
* build: respect CPPFLAGS, LDFLAGS
- CPPFLAGS is for the C preprocessor (usually for setting defines)
- LDFLAGS should be placed before objects for certain flags to work
(e.g. -Wl,--as-needed)
Signed-off-by: Sam James <sam@gentoo.org>
Co-authored-by: Luca Deri <lucaderi@users.noreply.github.com>
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/ubuntu/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/ubuntu/Makefile.in b/packages/ubuntu/Makefile.in index 13dfa7298..f1f0fdfda 100644 --- a/packages/ubuntu/Makefile.in +++ b/packages/ubuntu/Makefile.in @@ -6,7 +6,7 @@ ndpi: mkdir -p ./debian/ndpi-tmp ./debian/ndpi-dev-tmp mkdir -p ./debian/ndpi-tmp/usr/lib ./debian/ndpi-tmp/usr/bin mkdir -p ./debian/ndpi-dev-tmp/usr/lib ./debian/ndpi-dev-tmp/usr/include/ndpi ./debian/ndpi-dev-tmp/usr/lib/pkgconfig - cd ${NDPI_HOME}; ./autogen.sh; ./configure; make + cd ${NDPI_HOME}; ./autogen.sh; ./configure; $(MAKE) cp $(NDPI_HOME)/src/lib/libndpi.so.@NDPI_VERS@ ./debian/ndpi-tmp/usr/lib/ cd ./debian/ndpi-tmp/usr/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so; cd - cd ./debian/ndpi-tmp/usr/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so.@MAJOR_RELEASE@; cd - @@ -33,11 +33,11 @@ ndpi: @echo "-------------------------------" distclean: - -cd ${NDPI_HOME} && make distclean + -cd ${NDPI_HOME} && $(MAKE) distclean install: - cd ${NDPI_HOME}; make install DESTDIR="${NDPI_BUILD}/debian/tmp" AM_UPDATE_INFO_DIR=no + cd ${NDPI_HOME}; $(MAKE) install DESTDIR="${NDPI_BUILD}/debian/tmp" AM_UPDATE_INFO_DIR=no clean: - -cd ${NDPI_HOME} && make clean + -cd ${NDPI_HOME} && $(MAKE) clean -rm -rf *~ *deb ./usr ./debian/ndpi ./debian/ndpi-dev ./debian/ndpi ./debian/ndpi-dev |