Hello community, here is the log from the commit of package pcmciautils for openSUSE:Factory checked in at 2012-02-03 10:25:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcmciautils (Old) and /work/SRC/openSUSE:Factory/.pcmciautils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcmciautils", Maintainer is "GLin@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/pcmciautils/pcmciautils.changes 2011-10-26 15:42:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pcmciautils.new/pcmciautils.changes 2012-02-03 10:25:22.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 31 12:49:50 UTC 2012 - dlovasko@suse.com + +- Added patch for platform independent executable build + +------------------------------------------------------------------- New: ---- pcmciautils_pie.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcmciautils.spec ++++++ --- /var/tmp/diff_new_pack.GvZF52/_old 2012-02-03 10:25:23.000000000 +0100 +++ /var/tmp/diff_new_pack.GvZF52/_new 2012-02-03 10:25:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pcmciautils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,7 @@ Source: pcmciautils-%{version}.tar.bz2 Patch1: pcmciautils_config.opts.202500.diff Patch2: pcmciautils_fix1.diff +Patch3: pcmciautils_pie.diff Source1: suse-files.tar.bz2 Source2: cis-files.tar.bz2 @@ -64,9 +65,10 @@ %setup -n pcmciautils-%{version} -T -D -a 1 %setup -n pcmciautils-%{version} -T -D -a 2 %patch2 -p1 +%patch3 -p1 %build -make all DEF_CFLAGS="$RPM_OPT_FLAGS" STRIPCMD=true +make all DEF_CFLAGS="-fPIE $RPM_OPT_FLAGS" DEF_LDFLAGS="-pie" STRIPCMD=true # make debugtools %install ++++++ pcmciautils_pie.diff ++++++ --- pcmciautils-017/Makefile +++ pcmciautils-017/Makefile @@ -126,7 +126,7 @@ WARNINGS += $(call cc-supports,-Wno-poin WARNINGS += $(call cc-supports,-Wdeclaration-after-statement) WARNINGS += -Wshadow -CFLAGS += -pipe -DPCMCIAUTILS_VERSION=\"$(VERSION)\" +CFLAGS += -fpie -pipe -DPCMCIAUTILS_VERSION=\"$(VERSION)\" YFLAGS := -d HEADERS = \ @@ -226,7 +226,7 @@ build/ccdv: build/ccdv.c mv y.tab.h $*.h $(PCCARDCTL): $(LIBC) src/$(PCCARDCTL).o src/$(PCCARDCTL).c $(OBJS) $(HEADERS) - $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/$(PCCARDCTL).o $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(LD) $(LDFLAGS) -pie -o $@ $(CRT0) src/$(PCCARDCTL).o $(LIB_OBJS) $(ARCH_LIB_OBJS) $(QUIET) $(STRIPCMD) $@ $(PCMCIA_CHECK_BROKEN_CIS): $(LIBC) src/$(PCMCIA_CHECK_BROKEN_CIS).o src/read-cis.o $(OBJS) $(HEADERS) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org