From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 13 Jan 2008 17:06:12 +0000 (+0000)
Subject: - more -fpie removals
X-Git-Tag: auto/ti/rpm-4_4_9-14~3
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=78ba9514d2eba558659c5fb5ec3db4d80ed5499c;p=packages%2Frpm.git

- more -fpie removals

Changed files:
    rpm-nopie.patch -> 1.1.2.1.4.1
---

diff --git a/rpm-nopie.patch b/rpm-nopie.patch
index 5afcfa4..c6c7602 100644
--- a/rpm-nopie.patch
+++ b/rpm-nopie.patch
@@ -1,4 +1,3 @@
-diff -urN rpm-4.4.9.org/configure.ac rpm-4.4.9/configure.ac
 --- rpm-4.4.9.org/configure.ac	2007-05-19 21:26:29.000000000 +0200
 +++ rpm-4.4.9/configure.ac	2007-11-15 01:11:58.263879867 +0100
 @@ -35,7 +35,6 @@
@@ -9,3 +8,51 @@ diff -urN rpm-4.4.9.org/configure.ac rpm-4.4.9/configure.ac
  fi
  export CFLAGS LDFLAGS
  
+--- rpm-4.4.9/Makefile.am~	2008-01-10 11:08:04.000000000 +0200
++++ rpm-4.4.9/Makefile.am	2008-01-10 11:30:56.897013850 +0200
+@@ -62,19 +62,19 @@
+ #rpm_LDFLAGS =		$(myLDFLAGS)
+ #rpm_LDADD =		rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD)
+ rpm.o:	$(top_srcdir)/rpmqv.c
+-	$(COMPILE) -fpie -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $<
++	$(COMPILE) -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $<
+ 
+ rpmb_SOURCES =		$(top_srcdir)/build.c
+ rpmb_LDFLAGS =		$(myLDFLAGS) $(staticLDFLAGS)
+ rpmb_LDADD =		rpmb.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
+ rpmb.o:	$(top_srcdir)/rpmqv.c
+-	$(COMPILE) -fpie -DIAM_RPMBT -o $@ -c $<
++	$(COMPILE) -DIAM_RPMBT -o $@ -c $<
+ 
+ rpmd_SOURCES =
+ rpmd_LDFLAGS =		$(myLDFLAGS) $(staticLDFLAGS)
+ rpmd_LDADD =		rpmd.o $(myLDADD)
+ rpmd.o:	$(top_srcdir)/rpmqv.c
+-	$(COMPILE) -fpie -DIAM_RPMDB -o $@ -c $<
++	$(COMPILE) -DIAM_RPMDB -o $@ -c $<
+ 
+ rpmi_SOURCES =
+ rpmi_LDFLAGS =		$(myLDFLAGS) # $(staticLDFLAGS)
+@@ -82,19 +82,19 @@
+ #rpmi_LDFLAGS =		$(myLDFLAGS)
+ #rpmi_LDADD =		rpmi.o $(myLDADD)
+ rpmi.o:	$(top_srcdir)/rpmqv.c
+-	$(COMPILE) -fpie -DIAM_RPMEIU -o $@ -c $<
++	$(COMPILE) -DIAM_RPMEIU -o $@ -c $<
+ 
+ rpmk_SOURCES =
+ rpmk_LDFLAGS =		$(myLDFLAGS) $(staticLDFLAGS)
+ rpmk_LDADD =		rpmk.o $(myLDADD)
+ rpmk.o:	$(top_srcdir)/rpmqv.c
+-	$(COMPILE) -fpie -DIAM_RPMK -o $@ -c $<
++	$(COMPILE) -DIAM_RPMK -o $@ -c $<
+ 
+ rpmq_SOURCES =
+ rpmq_LDFLAGS =		$(myLDFLAGS) # $(staticLDFLAGS)
+ rpmq_LDADD =		rpmq.o $(top_builddir)/build/librpmbuild.la $(myLDADD)
+ rpmq.o:	$(top_srcdir)/rpmqv.c
+-	$(COMPILE) -fpie -DIAM_RPMQV -o $@ -c $<
++	$(COMPILE) -DIAM_RPMQV -o $@ -c $<
+ 
+ $(PROGRAMS): 		@WITH_APIDOCS_TARGET@
+