- Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with
fPIC
This commit is contained in:
parent
0d25c0cbd4
commit
9abadcc1b2
23
antlr.spec
23
antlr.spec
@ -39,7 +39,7 @@
|
|||||||
Summary: ANother Tool for Language Recognition
|
Summary: ANother Tool for Language Recognition
|
||||||
Name: antlr
|
Name: antlr
|
||||||
Version: 2.7.7
|
Version: 2.7.7
|
||||||
Release: 1jpp.5%{?dist}
|
Release: 1jpp.6%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
URL: http://www.antlr.org/
|
URL: http://www.antlr.org/
|
||||||
@ -155,24 +155,8 @@ ant -Dj2se.apidoc=%{_javadocdir}/java
|
|||||||
cp work/lib/antlr.jar . # make expects to find it here
|
cp work/lib/antlr.jar . # make expects to find it here
|
||||||
export CLASSPATH=.
|
export CLASSPATH=.
|
||||||
%configure --without-examples
|
%configure --without-examples
|
||||||
make
|
|
||||||
|
|
||||||
pushd lib/cpp/src/
|
|
||||||
mkdir temp_holder_for_nonpic
|
|
||||||
mv libantlr.a temp_holder_for_nonpic/
|
|
||||||
make clean
|
|
||||||
|
|
||||||
# Compile with PIC
|
|
||||||
make CXXFLAGS="${CXXFLAGS} -fPIC"
|
make CXXFLAGS="${CXXFLAGS} -fPIC"
|
||||||
|
|
||||||
# Move files out
|
|
||||||
mv libantlr.a libantlr-pic.a
|
|
||||||
mv temp_holder_for_nonpic/libantlr.a .
|
|
||||||
|
|
||||||
# Cleanup temp dir
|
|
||||||
rmdir temp_holder_for_nonpic
|
|
||||||
popd
|
|
||||||
|
|
||||||
find . -type f > /tmp/antlr.filelist
|
find . -type f > /tmp/antlr.filelist
|
||||||
rm antlr.jar # no longer needed
|
rm antlr.jar # no longer needed
|
||||||
%endif
|
%endif
|
||||||
@ -203,7 +187,6 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/antlr-java
|
|||||||
mkdir -p $RPM_BUILD_ROOT{%{headers},%{_libdir}}
|
mkdir -p $RPM_BUILD_ROOT{%{headers},%{_libdir}}
|
||||||
install -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{headers}
|
install -m 644 lib/cpp/antlr/*.hpp $RPM_BUILD_ROOT%{headers}
|
||||||
install -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir}
|
install -m 644 lib/cpp/src/libantlr.a $RPM_BUILD_ROOT%{_libdir}
|
||||||
install -m 644 lib/cpp/src/libantlr-pic.a $RPM_BUILD_ROOT%{_libdir}
|
|
||||||
install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
|
install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
|
||||||
|
|
||||||
# javadoc
|
# javadoc
|
||||||
@ -299,7 +282,6 @@ fi
|
|||||||
%{_javadir}/%{name}*.jar
|
%{_javadir}/%{name}*.jar
|
||||||
%{headers}
|
%{headers}
|
||||||
%{_libdir}/libantlr.a
|
%{_libdir}/libantlr.a
|
||||||
%{_libdir}/libantlr-pic.a
|
|
||||||
%defattr(0755,root,root,0755)
|
%defattr(0755,root,root,0755)
|
||||||
%ghost %{_bindir}/antlr
|
%ghost %{_bindir}/antlr
|
||||||
%{_bindir}/antlr-config
|
%{_bindir}/antlr-config
|
||||||
@ -327,6 +309,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 24 2007 Deepak Bhole <dbhole@redhat.com> 2.7.7-1jpp.6
|
||||||
|
- Resolve bz# 242305: Remove libantlr-pic.a, and compile libantlr.a with fPIC
|
||||||
|
|
||||||
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.7.7-1jpp.5
|
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.7.7-1jpp.5
|
||||||
- Rebuild for selinux ppc32 issue.
|
- Rebuild for selinux ppc32 issue.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user