Author: jjneely
Update of /cvs/free/rpms/openafs/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8830
Modified Files:
openafs.spec
Added Files:
openafs-1.6.0-fPIC.patch
Log Message:
* Thu Aug 04 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-0.pre7.2
- BuildReq autoconf
- Patch osconf.m4 to force building with -fPIC as there were still
objects used in libraries that were not build with -fPIC
- Removed the CCOBJ environment variable with the configure line
openafs-1.6.0-fPIC.patch:
osconf.m4 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- NEW FILE openafs-1.6.0-fPIC.patch ---
--- src/cf/osconf.m4.orig 2011-08-05 13:46:52.780804506 -0400
+++ src/cf/osconf.m4 2011-08-05 13:50:10.734686871 -0400
@@ -240,7 +240,7 @@
amd64_linux*)
CCOBJ="${CC} -fPIC"
KERN_OPTMZ=-O2
- MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+ MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -fPIC'
MT_LIBS="-lpthread"
PAM_OPTMZ=-O2
PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
@@ -263,8 +263,9 @@
;;
i386_linux*)
+ CCOBJ="${CC} -fPIC"
KERN_OPTMZ=-O2
- MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+ MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -fPIC'
MT_LIBS="-lpthread"
DBG=-g
KERN_DBG=-g
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-15/openafs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openafs.spec 25 Jul 2011 15:15:42 -0000 1.14
+++ openafs.spec 5 Aug 2011 19:19:26 -0000 1.15
@@ -15,7 +15,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.0
-Release: 0.%{pre}.1%{?dist}
+Release: 0.%{pre}.2%{?dist}
License: IBM
Group: System Environment/Daemons
URL:
http://www.openafs.org
@@ -28,7 +28,9 @@
BuildRoot: %{_tmppath}/%{name}-root
BuildRequires: krb5-devel, pam-devel, ncurses-devel, flex, byacc, bison
-BuildRequires: automake
+BuildRequires: automake, autoconf
+
+Patch0: openafs-1.6.0-fPIC.patch
%description
The AFS distributed filesystem. AFS is a distributed filesystem
@@ -92,6 +94,9 @@
%prep
%setup -q -b 1 -n openafs-%{version}%{pre}
+# This changes osconf.m4 to build with -fPIC on i386 and x86_64
+%patch0
+
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -116,8 +121,7 @@
--disable-kernel-module \
--disable-strip-binaries \
--enable-supergroups \
- --with-krb5-conf=/usr/bin/krb5-config \
- CCOBJ=-fPIC
+ --with-krb5-conf=/usr/bin/krb5-config
# Build is not SMP compliant
make $RPM_OPT_FLGS all_nolibafs
@@ -316,6 +320,12 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Thu Aug 04 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-0.pre7.2
+- BuildReq autoconf
+- Patch osconf.m4 to force building with -fPIC as there were still
+ objects used in libraries that were not build with -fPIC
+- Removed the CCOBJ environment variable with the configure line
+
* Mon Jul 25 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-0.pre7.1
- rpmFusion Bug 1783
- Populate and set SELinux context for the AFS cache directory