Skip to content

Commit

Permalink
Merge branch 'properly_disable_static' into 'master'
Browse files Browse the repository at this point in the history
[openjpeg] Disable static build properly. Contributes to JB#43982

See merge request mer-core/openjpeg!2
  • Loading branch information
pvuorela committed Nov 28, 2018
2 parents 83c23e6 + 49fe7c0 commit 5d39656
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions rpm/openjpeg.spec
Expand Up @@ -2,12 +2,9 @@ Name: openjpeg
Version: 2.3.0
Release: 1
Summary: JPEG 2000 codec library

Group: System/Libraries
License: BSD
URL: http://www.openjpeg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: cmake
BuildRequires: libtiff-devel

Expand All @@ -33,6 +30,7 @@ The openjpeg-utils package contains command-line tools.
Summary: Development files for openjpeg
Group: Development/Libraries
Requires: openjpeg = %{version}-%{release}
Requires: openjpeg-utils = %{version}-%{release}

%description devel
The openjpeg-devel package contains libraries and header files for
Expand All @@ -46,15 +44,15 @@ developing applications that use OpenJPEG.
%build
if [ ! -d build ] ; then mkdir build; fi
pushd build
%cmake .. -DBUILD_EXAMPLES:BOOL=ON
%cmake -DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release \
..
make %{?_smp_mflags}
popd

%install
rm -rf %{buildroot}
pushd build
make install DESTDIR="%{buildroot}"
rm %{buildroot}%{_libdir}/libopenjp2.a
popd

%check
Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated from 081de4 to 66297f

0 comments on commit 5d39656

Please sign in to comment.