Skip to content

Commit

Permalink
[rpm] Switch crypto from nss to openssl to reduce build loops. Fixes …
Browse files Browse the repository at this point in the history
…JB#45074. Contributes JB#36024.

Also drop the transitional legacy lib copy from the previous upgrade.
  • Loading branch information
Andrew Branson committed Mar 11, 2019
1 parent 84ae95f commit 2458dc7
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions rpm/rpm.spec
Expand Up @@ -35,6 +35,7 @@ License: GPLv2+
Requires: curl
Requires: coreutils
Requires: db4-utils
Requires: openssl-libs
BuildRequires: db4-devel

BuildRequires: meego-rpm-config
Expand All @@ -45,7 +46,7 @@ BuildRequires: gawk
BuildRequires: elfutils-devel >= 0.112
BuildRequires: elfutils-libelf-devel
BuildRequires: readline-devel zlib-devel
BuildRequires: nss-devel
BuildRequires: openssl-devel
# The popt version here just documents an older known-good version
BuildRequires: popt-devel >= 1.10.2
BuildRequires: file-devel
Expand Down Expand Up @@ -135,7 +136,6 @@ Man pages for %{name}, %{name}-build and %{name}-devel.
%patch14 -p1

%build
CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
CFLAGS="$RPM_OPT_FLAGS"
export CPPFLAGS CFLAGS LDFLAGS
_libdir=%{_usr}/lib
Expand All @@ -148,6 +148,7 @@ _libdir=%{_usr}/lib
--libdir=%{_usr}/lib \
--with-vendor=meego \
--with-external-db \
--with-crypto=openssl \
%if %{with python}
--enable-python \
%endif
Expand All @@ -161,16 +162,6 @@ rm -rf $RPM_BUILD_ROOT

%make_install

# HACK: include older .so so we can get everything rebuilt properly
cp -a /%{_libdir}/librpm.so.2.0.2 $RPM_BUILD_ROOT/%{_libdir}/
cp -a /%{_libdir}/librpm.so.2 $RPM_BUILD_ROOT/%{_libdir}/
cp -a /%{_libdir}/librpmbuild.so.2.0.1 $RPM_BUILD_ROOT/%{_libdir}/
cp -a /%{_libdir}/librpmbuild.so.2 $RPM_BUILD_ROOT/%{_libdir}/
cp -a /%{_libdir}/librpmio.so.2.0.1 $RPM_BUILD_ROOT/%{_libdir}/
cp -a /%{_libdir}/librpmio.so.2 $RPM_BUILD_ROOT/%{_libdir}/
cp -a /%{_libdir}/librpmsign.so.0.0.1 $RPM_BUILD_ROOT/%{_libdir}/
cp -a /%{_libdir}/librpmsign.so.0 $RPM_BUILD_ROOT/%{_libdir}/

#sed "s/i386/arm/g" platform > platform.arm
#sed "s/i386/mipsel/g" platform > platform.mipsel

Expand Down

0 comments on commit 2458dc7

Please sign in to comment.