- Insert the "-fPIC" on configure command-line.

- Drop the -fPIC patch.
This commit is contained in:
Štěpán Kasal 2008-01-14 10:26:35 +00:00
parent 356ece10f3
commit 823c989ac3
2 changed files with 6 additions and 16 deletions

View File

@ -1,10 +0,0 @@
--- flex-2.5.33/Makefile.in 2008-01-08 16:09:52.000000000 +0100
+++ flex-2.5.33-pm/Makefile.in 2008-01-08 16:10:22.000000000 +0100
@@ -375,6 +375,7 @@ SUBDIRS = \
tests
AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -I$(top_srcdir)/intl
+AM_CFLAGS = -fPIC
# Run GNU indent on sources. Don't run this unless all the sources compile cleanly.
#

View File

@ -1,7 +1,7 @@
Summary: A tool for creating scanners (text pattern recognizers)
Name: flex
Version: 2.5.33
Release: 13%{?dist}
Release: 14%{?dist}
License: BSD
Group: Development/Tools
URL: http://flex.sourceforge.net/
@ -10,7 +10,6 @@ Patch1: flex-2.5.33-yy.patch
Patch2: flex-2.5.33-opts.patch
Patch3: flex-2.5.33-includedir.patch
Patch4: flex-2.5.33-test-linedir-r.patch
Patch5: flex-2.5.33-pic.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: m4
BuildRequires: gettext bison m4 gawk autoconf automake gettext-devel
@ -38,12 +37,9 @@ application development.
%patch3 -p1
%patch4 -p1
./autogen.sh
# The -fPIC patch has to be applied after the build system is
# re-generated.
%patch5 -p1
%build
%configure --disable-dependency-tracking
%configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
make %{?_smp_mflags}
%install
@ -87,6 +83,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_infodir}/flex.info*
%changelog
* Thu Jan 10 2008 Stepan Kasal <skasal@redhat.com> - 2.5.33-14
- Insert the "-fPIC" on configure command-line.
- Drop the -fPIC patch.
* Tue Jan 8 2008 Petr Machata <pmachata@redhat.com> - 2.5.33-13
- Patch with -fPIC only after the autogen.sh is run.