Skip to content

Commit 670055f

Browse files
committed
Fix rpath's for distributed libraries and binaries
During the build, the rpath's are the build directory, which won't exist in a distributed package.
1 parent 4739e45 commit 670055f

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

M2/configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ AC_CHECK_PROGS(CMP,cmp,false)
175175
AS_IF([test $CMP = false],
176176
AC_MSG_ERROR([cmp is required (try installing 'diffutils' package)]))
177177
AC_CHECK_PROGS([CMAKE], [cmake], [false])
178+
AC_CHECK_PROGS([CHRPATH], [chrpath], [false])
178179

179180
AC_CHECK_TOOL(AR,ar,false)
180181
AC_CHECK_TOOL(AS,as,false)

M2/distributions/install/Makefile.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ install::
1111
$(MKDIR_P) $(DESTDIR)@prefix@
1212
$(T) -C @pre_prefix@ . | @TAR@ xfp - -C $(DESTDIR)@prefix@
1313
$(T) -C @pre_exec_prefix@ . | @TAR@ xfp - -C $(DESTDIR)@exec_prefix@
14+
# fix rpath's
15+
ifeq (@CHRPATH@,chrpath)
16+
for file in $(DESTDIR)@librariesdir@/* $(DESTDIR)@programsdir@/*; \
17+
do \
18+
if @CHRPATH@ $$file > /dev/null 2>&1; \
19+
then @CHRPATH@ $$file -r @librariesdir@; \
20+
fi; \
21+
done
22+
endif
1423

1524
install::$(DESTDIR)@infodir@/dir
1625
$(DESTDIR)@infodir@/dir :; @INSTALL_DATA@ @abs_top_srcdir@/files/info-dir-template $@

0 commit comments

Comments
 (0)