Cyclic0007/wolfssl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup debian build

Browse Source 
* CFLAGS get pulled in anyway with configure options, or part of the
  env, we don't need to add them
* Path handling went wrong in one specific platform test run
This commit is contained in:
Andrew Hutchings
2025-09-22 14:14:18 +01:00
parent 4ca5c315fc
commit b8df4d84e9
2 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -48,9 +48,7 @@ AC_SUBST([WOLFSSL_CONFIG_ARGS])
# Store configure options and CFLAGS for debian rules generation # Store configure options and CFLAGS for debian rules generation
CONFIGURE_OPTIONS="$ac_configure_args" CONFIGURE_OPTIONS="$ac_configure_args"
CONFIGURE_CFLAGS="$CFLAGS"
AC_SUBST([CONFIGURE_OPTIONS]) AC_SUBST([CONFIGURE_OPTIONS])
AC_SUBST([CONFIGURE_CFLAGS])
# shared library versioning # shared library versioning
# The three numbers in the libwolfssl.so.*.*.* file name. Unfortunately # The three numbers in the libwolfssl.so.*.*.* file name. Unfortunately

28
debian/rules.in vendored
View File

@@ -3,7 +3,6 @@
# Store the configure options and CFLAGS used during ./configure # Store the configure options and CFLAGS used during ./configure
# This file is generated from rules.in by the configure script # This file is generated from rules.in by the configure script
CONFIGURE_OPTIONS = @CONFIGURE_OPTIONS@ CONFIGURE_OPTIONS = @CONFIGURE_OPTIONS@
CONFIGURE_CFLAGS = @CONFIGURE_CFLAGS@
ENABLED_FIPS = @ENABLED_FIPS@ ENABLED_FIPS = @ENABLED_FIPS@
# Use debhelper with automatic sequence # Use debhelper with automatic sequence
@@ -16,18 +15,17 @@ override_dh_auto_configure:
--build=$(DEB_BUILD_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \
--host=$(DEB_HOST_GNU_TYPE) \ --host=$(DEB_HOST_GNU_TYPE) \
--prefix=/usr \ --prefix=/usr \
--mandir=\$${prefix}/share/man \ --mandir=/usr/share/man \
--infodir=\$${prefix}/share/info \ --infodir=/usr/share/info \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var \ --localstatedir=/var \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--libexecdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--disable-maintainer-mode \ --disable-maintainer-mode \
--disable-dependency-tracking \ --disable-dependency-tracking \
--enable-shared \ --enable-shared \
--enable-static \ --enable-static \
$(CONFIGURE_OPTIONS) \ $(CONFIGURE_OPTIONS)
CFLAGS="$(CONFIGURE_CFLAGS)"
# Override test to skip them (optional, remove if you want to run tests) # Override test to skip them (optional, remove if you want to run tests)
#override_dh_auto_test: #override_dh_auto_test:
@@ -50,22 +48,6 @@ override_dh_auto_install:
dh_auto_install dh_auto_install
# Remove .la files (not needed in modern Debian packages) # Remove .la files (not needed in modern Debian packages)
find debian/tmp -name '*.la' -delete find debian/tmp -name '*.la' -delete
# Move libraries to multiarch directory if needed
if [ -d debian/tmp/usr/lib ]; then \
mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH); \
if [ -f debian/tmp/usr/lib/libwolfssl.so.* ]; then \
mv debian/tmp/usr/lib/libwolfssl.so.* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/; \
fi; \
if [ -f debian/tmp/usr/lib/libwolfssl.so ]; then \
mv debian/tmp/usr/lib/libwolfssl.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/; \
fi; \
if [ -f debian/tmp/usr/lib/libwolfssl.a ]; then \
mv debian/tmp/usr/lib/libwolfssl.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/; \
fi; \
if [ -d debian/tmp/usr/lib/pkgconfig ]; then \
mv debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/; \
fi; \
fi
# Set proper permissions and strip symbols # Set proper permissions and strip symbols
override_dh_strip: override_dh_strip: