Commit Message
Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
libjpeg/libjpeg.nm | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
@@ -4,7 +4,7 @@
###############################################################################
name = libjpeg
-version = 1.4.2
+version = 2.1.4
release = 1
thisapp = libjpeg-turbo-%{version}
@@ -27,18 +27,28 @@ source_dl = http://sourceforge.net/projects/libjpeg-turbo/files/%{version}/
build
requires
- autoconf
- automake
+ cmake
gcc-c++
- libtool
nasm
end
- configure_options += \
- --enable-shared
+ # NASM object files are missing GNU Property note for Intel CET,
+ # force it on the resulting library
+ LDFLAGS +="-Wl,-z,ibt -Wl,-z,shstk"
- prepare_cmds
- autoreconf -vfi
+ export LD_LIBRARY_PATH = %{DIR_APP}
+
+ build
+ %{cmake} . \
+ -DCMAKE_SKIP_RPATH:BOOL=YES \
+ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=YES \
+ -DENABLE_STATIC:BOOL=NO
+
+ make %{PARALLELISMFLAGS}
+ end
+
+ test
+ make test
end
end