Attachment 5776 Details for Bug 7504 – patch1

[patch] patch1

0001-s3-build-don-t-use-pieflags-twice-ldflags-already-ha.patch (text/plain), 1.11 KB, created by Björn Jacke on 2010-06-09 09:56:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2010-06-09 09:56:40 UTC

Size: 1.11 KB

patch

obsolete

>From 76e7d8017d711ae33ec421b65abb793dccf73458 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>Date: Sat, 22 May 2010 16:48:16 +0200
>Subject: [PATCH 1/9] s3:build: don't use pieflags twice - ldflags already have them
>
>---
> source3/Makefile.in |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/Makefile.in b/source3/Makefile.in
>index f58bb70..0823be7 100644
>--- a/source3/Makefile.in
>+++ b/source3/Makefile.in
>@@ -1681,12 +1681,12 @@ bin/talloctort@EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ $(LIBTA
> 
> bin/replacetort@EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ $(LIBTALLOC)
> 	@echo Linking $@
>-	@$(CC) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
>+	@$(CC) -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
> 		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
> 
> bin/smbconftort@EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB)
> 	@echo Linking $@
>-	@$(CC) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
>+	@$(CC) -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
> 		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
> 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
> 
>-- 
>1.7.1
>

Flags:

metze: review+

Actions: View

Attachments on bug 7504: 5776 | 5777 | 5778 | 5779 | 5780 | 5781 | 5782 | 5783 | 5784 | 5793 | 5796 | 5798