Issue 7885 - [PATCH] wrong RPATH in contrib/passwd/Makefile
Summary: [PATCH] wrong RPATH in contrib/passwd/Makefile
Status: VERIFIED FIXED
Alias: None
Product: OpenLDAP
Classification: Unclassified
Component: contrib (show other issues)
Version: unspecified
Hardware: All All
: --- normal
Target Milestone: ---
Assignee: OpenLDAP project
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-06-27 18:23 UTC by Ryan Tandy
Modified: 2014-10-23 07:29 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this issue.
Description Ryan Tandy 2014-06-27 18:23:10 UTC
Full_Name: Ryan Tandy
Version: master
OS: Debian unstable
URL: 
Submission from: (NULL) (24.68.121.206)


Similar to #7858, another easy patch.


From 3047469eb717018e5b292352626cd084477faf12 Mon Sep 17 00:00:00 2001
From: Ryan Tandy <ryan@nardis.ca>
Date: Fri, 27 Jun 2014 11:15:26 -0700
Subject: [PATCH] fix contrib/passwd RPATH

---
 contrib/slapd-modules/passwd/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/slapd-modules/passwd/Makefile
b/contrib/slapd-modules/passwd/Makefile
index ba41304..c240366 100644
--- a/contrib/slapd-modules/passwd/Makefile
+++ b/contrib/slapd-modules/passwd/Makefile
@@ -33,19 +33,19 @@ all: $(PROGRAMS)
 
 pw-kerberos.la:	kerberos.lo
 	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-	-rpath $(PREFIX)/lib -module -o $@ $? -lkrb5
+	-rpath $(moduledir) -module -o $@ $? -lkrb5
 
 pw-netscape.la:	netscape.lo
 	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-	-rpath $(PREFIX)/lib -module -o $@ $? 
+	-rpath $(moduledir) -module -o $@ $? 
 
 pw-radius.la:	radius.lo
 	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-	-rpath $(PREFIX)/lib -module -o $@ $? -lradius
+	-rpath $(moduledir) -module -o $@ $? -lradius
 
 pw-apr1.la:	apr1.lo
 	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
-	-rpath $(PREFIX)/lib -module -o $@ $?
+	-rpath $(moduledir) -module -o $@ $?
 
 clean:
 	rm -rf *.o *.lo *.la .libs
-- 
2.0.0

Comment 1 Howard Chu 2014-06-30 04:55:16 UTC
changed notes
changed state Open to Test
moved from Incoming to Contrib
Comment 2 Howard Chu 2014-06-30 11:59:25 UTC
ryan@nardis.ca wrote:
> Full_Name: Ryan Tandy
> Version: master
> OS: Debian unstable
> URL:
> Submission from: (NULL) (24.68.121.206)
>
>
> Similar to #7858, another easy patch.

Thanks, committed to master.
>
>
>>From 3047469eb717018e5b292352626cd084477faf12 Mon Sep 17 00:00:00 2001
> From: Ryan Tandy <ryan@nardis.ca>
> Date: Fri, 27 Jun 2014 11:15:26 -0700
> Subject: [PATCH] fix contrib/passwd RPATH
>
> ---
>   contrib/slapd-modules/passwd/Makefile | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/contrib/slapd-modules/passwd/Makefile
> b/contrib/slapd-modules/passwd/Makefile
> index ba41304..c240366 100644
> --- a/contrib/slapd-modules/passwd/Makefile
> +++ b/contrib/slapd-modules/passwd/Makefile
> @@ -33,19 +33,19 @@ all: $(PROGRAMS)
>
>   pw-kerberos.la:	kerberos.lo
>   	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
> -	-rpath $(PREFIX)/lib -module -o $@ $? -lkrb5
> +	-rpath $(moduledir) -module -o $@ $? -lkrb5
>
>   pw-netscape.la:	netscape.lo
>   	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
> -	-rpath $(PREFIX)/lib -module -o $@ $?
> +	-rpath $(moduledir) -module -o $@ $?
>
>   pw-radius.la:	radius.lo
>   	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
> -	-rpath $(PREFIX)/lib -module -o $@ $? -lradius
> +	-rpath $(moduledir) -module -o $@ $? -lradius
>
>   pw-apr1.la:	apr1.lo
>   	$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info $(LTVER) \
> -	-rpath $(PREFIX)/lib -module -o $@ $?
> +	-rpath $(moduledir) -module -o $@ $?
>
>   clean:
>   	rm -rf *.o *.lo *.la .libs
>


-- 
   -- Howard Chu
   CTO, Symas Corp.           http://www.symas.com
   Director, Highland Sun     http://highlandsun.com/hyc/
   Chief Architect, OpenLDAP  http://www.openldap.org/project/

Comment 3 Quanah Gibson-Mount 2014-07-22 10:34:17 UTC
changed notes
changed state Test to Release
Comment 4 OpenLDAP project 2014-10-23 07:29:46 UTC
fixed in master
fixed in RE25
fixed in RE24
Comment 5 Quanah Gibson-Mount 2014-10-23 07:29:46 UTC
changed notes
changed state Release to Closed