rpms/antlr/F-7 antlr.spec,1.31,1.32

Deepak Bhole (dbhole) fedora-extras-commits at redhat.com
Tue Jun 12 20:07:06 UTC 2007


Author: dbhole

Update of /cvs/extras/rpms/antlr/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18581

Modified Files:
	antlr.spec 
Log Message:

- Added a PIC compiled archive (bz# 242305)




Index: antlr.spec
===================================================================
RCS file: /cvs/extras/rpms/antlr/F-7/antlr.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- antlr.spec	26 Mar 2007 18:19:10 -0000	1.31
+++ antlr.spec	12 Jun 2007 20:06:30 -0000	1.32
@@ -39,7 +39,7 @@
 Summary:        ANother Tool for Language Recognition
 Name:           antlr
 Version:        2.7.7
-Release:        1jpp.2
+Release:        1jpp.3%{?dist}.1
 Epoch:          0
 License:        Public Domain
 URL:            http://www.antlr.org/
@@ -155,7 +155,24 @@
 cp work/lib/antlr.jar .  # make expects to find it here
 export CLASSPATH=.
 %configure --without-examples
-make
+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"
+
+    # 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
 rm antlr.jar             # no longer needed
 %endif
@@ -186,6 +203,7 @@
 mkdir -p $RPM_BUILD_ROOT{%{headers},%{_libdir}}
 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-pic.a $RPM_BUILD_ROOT%{_libdir}
 install -m 755 scripts/antlr-config $RPM_BUILD_ROOT%{_bindir}
 
 # javadoc
@@ -281,6 +299,7 @@
 %{_javadir}/%{name}*.jar
 %{headers}
 %{_libdir}/libantlr.a
+%{_libdir}/libantlr-pic.a
 %defattr(0755,root,root,0755)
 %ghost %{_bindir}/antlr
 %{_bindir}/antlr-config
@@ -308,6 +327,9 @@
 
 
 %changelog
+* Tue Jun 12 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.3.fc7.1
+- Added a PIC compiled archive (bz# 242305)
+
 * Mon Mar 26 2007 Deepak Bhole <dbhole at redhat.com> 2.7.7-1jpp.2
 - Added unowned dir to files list
 




More information about the scm-commits mailing list