Patchwork Fix PR56780: --disable-install-libiberty still installs libiberty.a

login
register
mail settings
Submitter Matt Burgess
Date May 22, 2013, 9:41 p.m.
Message ID <1369258897.2122.9.camel@kyoto.localdomain>
Download mbox | patch
Permalink /patch/245723/
State New
Headers show

Comments

Matt Burgess - May 22, 2013, 9:41 p.m.
Hi Ian,

Thanks for the review.  Here's v2, which I think addresses both of your
comments.

Kind Regards,

Matt.

2013-05-22 Matt Burgess <matthew@linuxfromscratch.org>

	other/PR56780
	* libiberty/configure.ac: Move test for --enable-install-libiberty
	outside of the 'with_target_subdir' test so that it actually gets run.
	Add output messages to show the test result.
	* libiberty/configure: Regenerate.
	* libiberty/Makefile.in (install_to_libdir): Place the installation
	of the libiberty library in the same guard as that used for the
	headers to prevent it being installed unless requested via
	--enable-install-libiberty.
Ian Taylor - May 22, 2013, 10:13 p.m.
On Wed, May 22, 2013 at 2:41 PM, Matt Burgess
<matthew@linuxfromscratch.org> wrote:
>
> 2013-05-22 Matt Burgess <matthew@linuxfromscratch.org>
>
>         other/PR56780
>         * libiberty/configure.ac: Move test for --enable-install-libiberty
>         outside of the 'with_target_subdir' test so that it actually gets run.
>         Add output messages to show the test result.
>         * libiberty/configure: Regenerate.
>         * libiberty/Makefile.in (install_to_libdir): Place the installation
>         of the libiberty library in the same guard as that used for the
>         headers to prevent it being installed unless requested via
>         --enable-install-libiberty.

This is OK.

Thanks.

Ian
Matt Burgess - May 30, 2013, 9:45 p.m.
On Wed, 2013-05-22 at 15:13 -0700, Ian Lance Taylor wrote:
> On Wed, May 22, 2013 at 2:41 PM, Matt Burgess
> <matthew@linuxfromscratch.org> wrote:
> >
> > 2013-05-22 Matt Burgess <matthew@linuxfromscratch.org>
> >
> >         other/PR56780
> >         * libiberty/configure.ac: Move test for --enable-install-libiberty
> >         outside of the 'with_target_subdir' test so that it actually gets run.
> >         Add output messages to show the test result.
> >         * libiberty/configure: Regenerate.
> >         * libiberty/Makefile.in (install_to_libdir): Place the installation
> >         of the libiberty library in the same guard as that used for the
> >         headers to prevent it being installed unless requested via
> >         --enable-install-libiberty.
> 
> This is OK.

Thanks, Ian.  Another step in the contributing guidelines I seem to have
missed is to inform you that I don't have write access to the GCC repo.
If you could commit this for me please, I'd appreciate it.

Thanks,

Matt.
Ian Taylor - June 1, 2013, 12:21 a.m.
On Thu, May 30, 2013 at 2:45 PM, Matt Burgess
<matthew@linuxfromscratch.org> wrote:
>
> Thanks, Ian.  Another step in the contributing guidelines I seem to have
> missed is to inform you that I don't have write access to the GCC repo.
> If you could commit this for me please, I'd appreciate it.

Committed.

Ian

Patch

Index: libiberty/Makefile.in
===================================================================
--- libiberty/Makefile.in	(revision 197373)
+++ libiberty/Makefile.in	(working copy)
@@ -355,19 +355,19 @@ 
 # since it will be passed the multilib flags.
 MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
 install_to_libdir: all
-	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
-	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
-	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
 	if test -n "${target_header_dir}"; then \
-	  case "${target_header_dir}" in \
-	    /*)    thd=${target_header_dir};; \
-	    *)     thd=${includedir}/${target_header_dir};; \
-	  esac; \
-	  ${mkinstalldirs} $(DESTDIR)$${thd}; \
-	  for h in ${INSTALLED_HEADERS}; do \
-	    ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
-	  done; \
+		${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
+		$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
+		( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
+		mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
+		case "${target_header_dir}" in \
+		  /*)    thd=${target_header_dir};; \
+		  *)     thd=${includedir}/${target_header_dir};; \
+		esac; \
+		${mkinstalldirs} $(DESTDIR)$${thd}; \
+		for h in ${INSTALLED_HEADERS}; do \
+		  ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
+		done; \
 	fi
 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
 
Index: libiberty/configure.ac
===================================================================
--- libiberty/configure.ac	(revision 197373)
+++ libiberty/configure.ac	(working copy)
@@ -128,6 +128,31 @@ 
    cross_compiling=maybe
 fi
 
+# We may wish to install the target headers somewhere.
+AC_MSG_CHECKING([whether to install libiberty headers and static library])
+dnl install-libiberty is disabled by default
+
+AC_ARG_ENABLE(install-libiberty,
+[  --enable-install-libiberty       Install headers and library for end users],
+enable_install_libiberty=$enableval,
+enable_install_libiberty=no)dnl
+
+# Option parsed, now set things appropriately.
+case x"$enable_install_libiberty" in
+  xyes|x)
+    target_header_dir=libiberty
+    ;;
+  xno)   
+    target_header_dir=
+    ;;
+  *) 
+    # This could be sanity-checked in various ways...
+    target_header_dir="${enable_install_libiberty}"
+    ;;
+esac
+AC_MSG_RESULT($enable_install_libiberty)
+AC_MSG_NOTICE([target_header_dir = $target_header_dir])
+
 GCC_NO_EXECUTABLES
 AC_PROG_CC
 AC_SYS_LARGEFILE
@@ -492,27 +517,6 @@ 
 
   esac
 
-  # We may wish to install the target headers somewhere.
-  AC_ARG_ENABLE(install-libiberty,
-  [  --enable-install-libiberty       Install headers for end users],
-  enable_install_libiberty=$enableval,
-  enable_install_libiberty=no)dnl
-  
-  # Option parsed, now set things appropriately.
-  case x"$enable_install_libiberty" in
-    xyes|x)
-      target_header_dir=libiberty
-      ;;
-    xno)   
-      target_header_dir=
-      ;;
-    *) 
-      # This could be sanity-checked in various ways...
-      target_header_dir="${enable_install_libiberty}"
-      ;;
-  esac
-
-
 else
 
    # Not a target library, so we set things up to run the test suite.