rpms/jansi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use standard variables when compiling binary artifact

Browse Source 
After a %set_build_flags, we can use the standard $CC, $CFLAGS and
$LDFLAGS
This commit is contained in:
Timm Bäder 2021-01-14 10:19:27 +01:00
parent 3a898d80b1
commit db2bae716e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jansi.spec
View File

@ -1,6 +1,6 @@
Name: jansi Name: jansi
Version: 2.1.1 Version: 2.1.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Generate and interpret ANSI escape sequences in Java Summary: Generate and interpret ANSI escape sequences in Java
License: ASL 2.0 License: ASL 2.0
@ -61,14 +61,15 @@ sed -i 's,@LIBDIR@,%{libdir},' \
src/main/java/org/fusesource/jansi/internal/JansiLoader.java src/main/java/org/fusesource/jansi/internal/JansiLoader.java
%build %build
%set_build_flags
# Build the native artifact # Build the native artifact
CFLAGS="%{build_cflags} -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden" CFLAGS="$CFLAGS -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden"
cd src/main/native cd src/main/native
gcc $CFLAGS -c jansi.c $CC $CFLAGS -c jansi.c
gcc $CFLAGS -c jansi_isatty.c $CC $CFLAGS -c jansi_isatty.c
gcc $CFLAGS -c jansi_structs.c $CC $CFLAGS -c jansi_structs.c
gcc $CFLAGS -c jansi_ttyname.c $CC $CFLAGS -c jansi_ttyname.c
gcc $CFLAGS %{build_ldflags} -shared -o libjansi.so *.o -lutil $CC $CFLAGS $LDFLAGS -shared -o libjansi.so *.o -lutil
cd - cd -
# Build the Java artifacts # Build the Java artifacts
@ -91,6 +92,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_libdir}/%{name}
%license license.txt %license license.txt
%changelog %changelog
* Thu Jan 14 2021 Timm Bäder <tbaeder@redhat.com> - 2.1.1-2
- Use standard variables when compiling native artifact
* Tue Dec 15 2020 Jerry James <loganjerry@gmail.com> - 2.1.1-1 * Tue Dec 15 2020 Jerry James <loganjerry@gmail.com> - 2.1.1-1
- Version 2.1.1 - Version 2.1.1
- Remove package name from Summary - Remove package name from Summary