Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 873028 Details for
Bug 1074912
Unbundle libopts
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Patch for sources
sharutils-4.14-Use-system-libopts.patch (text/plain), 3.76 KB, created by
Petr Pisar
on 2014-03-11 09:14:24 UTC
(
hide
)
Description:
Patch for sources
Filename:
MIME Type:
Creator:
Petr Pisar
Created:
2014-03-11 09:14:24 UTC
Size:
3.76 KB
patch
obsolete
>From e31f8c3e28be5cf7b95c2ed539c662536544afd2 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> >Date: Fri, 7 Mar 2014 13:49:56 +0100 >Subject: [PATCH] Use system libopts > >One has to configure --disable-dependency-trakcing to generate the header >files by autogen properly. >--- > Makefile.am | 2 +- > configure.ac | 3 ++- > src/Makefile.am | 29 ++++++++++++++++++++++++----- > 3 files changed, 27 insertions(+), 7 deletions(-) > >diff --git a/Makefile.am b/Makefile.am >index 21d1ac4..23c7320 100644 >--- a/Makefile.am >+++ b/Makefile.am >@@ -17,5 +17,5 @@ > ## Process this file with automake to produce Makefile.in. > > EXTRA_DIST = config.rpath m4 $(DIST_ALPHA) >-SUBDIRS = intl lib libopts src doc po tests >+SUBDIRS = intl lib src doc po tests > ACLOCAL_AMFLAGS = -I m4 >diff --git a/configure.ac b/configure.ac >index 344295a..8da3e76 100644 >--- a/configure.ac >+++ b/configure.ac >@@ -114,6 +114,8 @@ ac_cv_header_time_h=yes > ac_cv_header_unistd_h=yes > ]INVOKE_LIBOPTS_MACROS > >+PKG_CHECK_MODULES([AUTOOPTS], [autoopts]) >+ > [AUTOGEN=`command -v autogen` > $AUTOGEN --version >/dev/null 2>&1 || AUTOGEN='touch $@'] > AC_SUBST(AUTOGEN) >@@ -128,7 +130,6 @@ AC_CONFIG_FILES([ > po/Makefile.in > src/Makefile > tests/Makefile >- libopts/Makefile > Makefile > ]) > AC_OUTPUT >diff --git a/src/Makefile.am b/src/Makefile.am >index 1a6daac..840be4b 100644 >--- a/src/Makefile.am >+++ b/src/Makefile.am >@@ -24,7 +24,7 @@ > # But libgnu.a must also follow $(LIBINTL), since libintl uses > # replacement functions defined in libgnu.a. > >-LDADD = $(top_builddir)/libopts/libopts.a $(top_builddir)/lib/libgnu.a \ >+LDADD = @AUTOOPTS_LIBS@ $(top_builddir)/lib/libgnu.a \ > $(LIBINTL) $(top_builddir)/lib/libgnu.a $(GETHOSTNAME_LIB) $(LIBSOCKET) > > shar_LDADD = $(LDADD) >@@ -89,10 +89,9 @@ DISTCLEANFILES = $(bin_SCRIPTS) > > localedir = $(datadir)/locale > >-AOINC = -I$(top_srcdir)/libopts > > # `autoopts-config cflags` >-AM_CPPFLAGS = $(AOINC) -I$(srcdir) -I$(top_builddir) \ >+AM_CPPFLAGS = @AUTOOPTS_CFLAGS@ -I$(srcdir) -I$(top_builddir) \ > -I$(top_srcdir)/lib -I$(top_builddir)/lib -I$(top_builddir)/intl > > DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ >@@ -103,32 +102,52 @@ if UUCODE > uudecode_SOURCES = uudecode.c local.h $(decode_opt_code) > uuencode_SOURCES = uuencode.c local.h $(encode_opt_code) > >+uudecode.$(OBJEXT): uudecode-opts.h >+uuencode.$(OBJEXT): uuencode-opts.h >+ > if AMDEP > uuencode-opts.c uuencode-opts.h : $(DEPDIR)/uuencode-opts.dep > $(DEPDIR)/uuencode-opts.dep : uuencode-opts.def shar-std.def >+else >+uuencode-opts.c uuencode-opts.h : uuencode-opts.def shar-std.def >+endif >+# AMDEP > $(AUTOGEN) $(ENCODE_DEP_ARG) uuencode-opts.def > >+if AMDEP > uudecode-opts.c uudecode-opts.h : $(DEPDIR)/uudecode-opts.dep > $(DEPDIR)/uudecode-opts.dep : uudecode-opts.def shar-std.def >- $(AUTOGEN) $(DECODE_DEP_ARG) uudecode-opts.def >+else >+uudecode-opts.c uudecode-opts.h : uudecode-opts.def shar-std.def > endif > # AMDEP >+ $(AUTOGEN) $(DECODE_DEP_ARG) uudecode-opts.def > endif > # UUCODE > > shar_SOURCES = shar.c local.h encode.c $(shar_extra) $(shar_opt_code) > unshar_SOURCES = unshar.c local.h encode.c $(unshar_opt_code) > >+shar.$(OBJEXT): shar-opts.h >+unshar.$(OBJEXT): unshar-opts.h >+ > if AMDEP > shar-opts.c shar-opts.h : $(DEPDIR)/shar-opts.dep > $(DEPDIR)/shar-opts.dep : shar-opts.def shar-std.def >+else >+shar-opts.c shar-opts.h : shar-opts.def shar-std.def >+endif >+# AMDEP > $(AUTOGEN) $(SHAR_DEP_ARG) shar-opts.def > >+if AMDEP > unshar-opts.c unshar-opts.h : $(DEPDIR)/unshar-opts.dep > $(DEPDIR)/unshar-opts.dep : unshar-opts.def shar-std.def >- $(AUTOGEN) $(UNSHAR_DEP_ARG) unshar-opts.def >+else >+unshar-opts.c unshar-opts.h : unshar-opts.def shar-std.def > endif > # AMDEP >+ $(AUTOGEN) $(UNSHAR_DEP_ARG) unshar-opts.def > > $(bin_PROGRAMS): $(top_builddir)/lib/libgnu.a > >-- >1.9.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 1074912
: 873028