Skip to content

R
riscv-gcc-1
Commit ad81a900 by Iain Buclaw Committed by Iain Buclaw
Options

Makefile.am (noinst_LTLIBRARIES): Rename libzgcj_convience.la to libz_convenience.la. 

2019-01-21  Iain Buclaw  <ibuclaw@gdcproject.org>

	* Makefile.am (noinst_LTLIBRARIES): Rename libzgcj_convience.la to
	libz_convenience.la.
	* Makefile.in: Regenerate.
	* configure.ac: Remove target_all.
	* configure: Regenerate.

From-SVN: r268119
parent f3a18a5c
Showing with 23 additions and 83 deletions
zlib/ChangeLog.gcj
2019-01-21 Iain Buclaw <ibuclaw@gdcproject.org>
* Makefile.am (noinst_LTLIBRARIES): Rename libzgcj_convience.la to
libz_convenience.la.
* Makefile.in: Regenerate.
* configure.ac: Remove target_all.
* configure: Regenerate.
2018-10-31 Joseph Myers <joseph@codesourcery.com>
PR bootstrap/82856
......
zlib/Makefile.am
......@@ -11,8 +11,8 @@ inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h \
zconf.h.in zlib.h zutil.c zutil.h
if TARGET_LIBRARY
noinst_LTLIBRARIES = libzgcj_convenience.la
libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES)
noinst_LTLIBRARIES = libz_convenience.la
libz_convenience_la_SOURCES = $(ZLIB_SOURCES)
else
toolexeclib_LIBRARIES = libz.a
libz_a_SOURCES = $(ZLIB_SOURCES)
......
zlib/Makefile.in
......@@ -161,8 +161,8 @@ am__objects_1 = libz_a-adler32.$(OBJEXT) libz_a-compress.$(OBJEXT) \
@TARGET_LIBRARY_FALSE@am_libz_a_OBJECTS = $(am__objects_1)
libz_a_OBJECTS = $(am_libz_a_OBJECTS)
LTLIBRARIES = $(noinst_LTLIBRARIES)
libzgcj_convenience_la_LIBADD =
am__libzgcj_convenience_la_SOURCES_DIST = adler32.c compress.c crc32.c \
libz_convenience_la_LIBADD =
am__libz_convenience_la_SOURCES_DIST = adler32.c compress.c crc32.c \
crc32.h deflate.c deflate.h gzguts.h gzread.c gzclose.c \
gzwrite.c gzlib.c infback.c inffast.c inffast.h inffixed.h \
inflate.c inflate.h inftrees.c inftrees.h trees.c trees.h \
......@@ -170,14 +170,14 @@ am__libzgcj_convenience_la_SOURCES_DIST = adler32.c compress.c crc32.c \
am__objects_2 = adler32.lo compress.lo crc32.lo deflate.lo gzread.lo \
gzclose.lo gzwrite.lo gzlib.lo infback.lo inffast.lo \
inflate.lo inftrees.lo trees.lo uncompr.lo zutil.lo
@TARGET_LIBRARY_TRUE@am_libzgcj_convenience_la_OBJECTS = \
@TARGET_LIBRARY_TRUE@am_libz_convenience_la_OBJECTS = \
@TARGET_LIBRARY_TRUE@ $(am__objects_2)
libzgcj_convenience_la_OBJECTS = $(am_libzgcj_convenience_la_OBJECTS)
libz_convenience_la_OBJECTS = $(am_libz_convenience_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
@TARGET_LIBRARY_TRUE@am_libzgcj_convenience_la_rpath =
@TARGET_LIBRARY_TRUE@am_libz_convenience_la_rpath =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -212,9 +212,9 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libz_a_SOURCES) $(libzgcj_convenience_la_SOURCES)
SOURCES = $(libz_a_SOURCES) $(libz_convenience_la_SOURCES)
DIST_SOURCES = $(am__libz_a_SOURCES_DIST) \
$(am__libzgcj_convenience_la_SOURCES_DIST)
$(am__libz_convenience_la_SOURCES_DIST)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -378,7 +378,6 @@ srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_all = @target_all@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
......@@ -395,8 +394,8 @@ infback.c inffast.c inffast.h inffixed.h inflate.c \
inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h \
zconf.h.in zlib.h zutil.c zutil.h
@TARGET_LIBRARY_TRUE@noinst_LTLIBRARIES = libzgcj_convenience.la
@TARGET_LIBRARY_TRUE@libzgcj_convenience_la_SOURCES = $(ZLIB_SOURCES)
@TARGET_LIBRARY_TRUE@noinst_LTLIBRARIES = libz_convenience.la
@TARGET_LIBRARY_TRUE@libz_convenience_la_SOURCES = $(ZLIB_SOURCES)
@TARGET_LIBRARY_FALSE@toolexeclib_LIBRARIES = libz.a
@TARGET_LIBRARY_FALSE@libz_a_SOURCES = $(ZLIB_SOURCES)
@TARGET_LIBRARY_FALSE@libz_a_CFLAGS = $(AM_CFLAGS) $(PICFLAG)
......@@ -534,8 +533,8 @@ clean-noinstLTLIBRARIES:
rm -f $${locs}; \
}
libzgcj_convenience.la: $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_DEPENDENCIES) $(EXTRA_libzgcj_convenience_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(am_libzgcj_convenience_la_rpath) $(libzgcj_convenience_la_OBJECTS) $(libzgcj_convenience_la_LIBADD) $(LIBS)
libz_convenience.la: $(libz_convenience_la_OBJECTS) $(libz_convenience_la_DEPENDENCIES) $(EXTRA_libz_convenience_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(am_libz_convenience_la_rpath) $(libz_convenience_la_OBJECTS) $(libz_convenience_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
......
zlib/configure
......@@ -639,7 +639,6 @@ TARGET_LIBRARY_FALSE
TARGET_LIBRARY_TRUE
toolexeclibdir
toolexecdir
target_all
CPP
OTOOL64
OTOOL
......@@ -10644,7 +10643,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10647 "configure"
#line 10646 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
......@@ -10750,7 +10749,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 10753 "configure"
#line 10752 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
......@@ -11139,9 +11138,6 @@ if test -n "$with_cross_host"; then
$as_echo "#define HAVE_STRERROR 1" >>confdefs.h
# We ignore --with-system-zlib in this case.
target_all=libzgcj.la
else
if test x$gcc_no_link = xyes; then
if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then
......@@ -11363,60 +11359,8 @@ _ACEOF
fi
done
if test "$with_system_zlib" = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
$as_echo_n "checking for deflate in -lz... " >&6; }
if ${ac_cv_lib_z_deflate+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lz $LIBS"
if test x$gcc_no_link = xyes; then
as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char deflate ();
int
main ()
{
return deflate ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_z_deflate=yes
else
ac_cv_lib_z_deflate=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5
$as_echo "$ac_cv_lib_z_deflate" >&6; }
if test "x$ac_cv_lib_z_deflate" = xyes; then :
target_all=
else
target_all=libzgcj.la
fi
else
target_all=libzgcj.la
fi
fi
for ac_header in unistd.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
......
zlib/configure.ac
......@@ -74,22 +74,11 @@ if test -n "$with_cross_host"; then
# we'll have.
AC_DEFINE(HAVE_MEMCPY)
AC_DEFINE(HAVE_STRERROR)
# We ignore --with-system-zlib in this case.
target_all=libzgcj.la
else
AC_FUNC_MMAP
AC_CHECK_FUNCS(memcpy strerror)
if test "$with_system_zlib" = yes; then
AC_CHECK_LIB(z, deflate, target_all=, target_all=libzgcj.la)
else
target_all=libzgcj.la
fi
fi
AC_SUBST(target_all)
AC_CHECK_HEADERS(unistd.h)
if test -n "$with_cross_host" &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment