Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ AC_SUBST([WOLFSSL_CONFIG_ARGS])

# Store configure options and CFLAGS for debian rules generation
CONFIGURE_OPTIONS="$ac_configure_args"
CONFIGURE_CFLAGS="$CFLAGS"
AC_SUBST([CONFIGURE_OPTIONS])
AC_SUBST([CONFIGURE_CFLAGS])

# shared library versioning
# The three numbers in the libwolfssl.so.*.*.* file name. Unfortunately
Expand Down
28 changes: 5 additions & 23 deletions debian/rules.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# Store the configure options and CFLAGS used during ./configure
# This file is generated from rules.in by the configure script
CONFIGURE_OPTIONS = @CONFIGURE_OPTIONS@
CONFIGURE_CFLAGS = @CONFIGURE_CFLAGS@
ENABLED_FIPS = @ENABLED_FIPS@

# Use debhelper with automatic sequence
Expand All @@ -16,18 +15,17 @@ override_dh_auto_configure:
--build=$(DEB_BUILD_GNU_TYPE) \
--host=$(DEB_HOST_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
--sysconfdir=/etc \
--localstatedir=/var \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--libexecdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--disable-maintainer-mode \
--disable-dependency-tracking \
--enable-shared \
--enable-static \
$(CONFIGURE_OPTIONS) \
CFLAGS="$(CONFIGURE_CFLAGS)"
$(CONFIGURE_OPTIONS)

# Override test to skip them (optional, remove if you want to run tests)
#override_dh_auto_test:
Expand All @@ -50,22 +48,6 @@ override_dh_auto_install:
dh_auto_install
# Remove .la files (not needed in modern Debian packages)
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
override_dh_strip:
Expand Down
Loading