make bison use libc getopt_long instead of building its own

This commit is contained in:
pvalchev 2003-01-18 20:34:35 +00:00
parent ee6953060c
commit c855cfa5ba
2 changed files with 58 additions and 0 deletions

View File

@ -0,0 +1,46 @@
$OpenBSD: patch-lib_Makefile_in,v 1.1 2003/01/18 20:34:35 pvalchev Exp $
--- lib/Makefile.in.orig Mon Mar 25 02:38:27 2002
+++ lib/Makefile.in Sat Jan 18 13:15:29 2003
@@ -120,7 +120,6 @@ EXTRA_DIST = malloc.c realloc.c strnlen.
libbison_a_SOURCES = \
basename.c dirname.h dirname.c \
- getopt.h getopt.c getopt1.c \
quote.h quote.c quotearg.h quotearg.c \
xalloc.h xmalloc.c xstrdup.c xstrndup.c gettext.h
@@ -135,7 +134,7 @@ LIBRARIES = $(noinst_LIBRARIES)
libbison_a_AR = $(AR) cru
am_libbison_a_OBJECTS = basename$U.$(OBJEXT) dirname$U.$(OBJEXT) \
- getopt$U.$(OBJEXT) getopt1$U.$(OBJEXT) quote$U.$(OBJEXT) \
+ quote$U.$(OBJEXT) \
quotearg$U.$(OBJEXT) xmalloc$U.$(OBJEXT) xstrdup$U.$(OBJEXT) \
xstrndup$U.$(OBJEXT)
libbison_a_OBJECTS = $(am_libbison_a_OBJECTS)
@@ -153,7 +152,6 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ $(DEPDIR)/realloc.Po $(DEPDIR)/stpcpy.Po \
@AMDEP_TRUE@ $(DEPDIR)/strchr.Po $(DEPDIR)/strspn.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/basename$U.Po ./$(DEPDIR)/dirname$U.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/getopt$U.Po ./$(DEPDIR)/getopt1$U.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/quote$U.Po ./$(DEPDIR)/quotearg$U.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xmalloc$U.Po ./$(DEPDIR)/xstrdup$U.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xstrndup$U.Po
@@ -215,8 +213,6 @@ mostlyclean-kr:
@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strspn.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quote$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotearg$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc$U.Po@am__quote@
@@ -277,7 +273,7 @@ xstrdup_.c: xstrdup.c $(ANSI2KNR)
xstrndup_.c: xstrndup.c $(ANSI2KNR)
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrndup.c; then echo $(srcdir)/xstrndup.c; else echo xstrndup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrndup_.c || rm -f xstrndup_.c
alloca_.$(OBJEXT) basename_.$(OBJEXT) dirname_.$(OBJEXT) \
-error_.$(OBJEXT) getopt_.$(OBJEXT) getopt1_.$(OBJEXT) malloc_.$(OBJEXT) \
+error_.$(OBJEXT) malloc_.$(OBJEXT) \
memchr_.$(OBJEXT) memrchr_.$(OBJEXT) obstack_.$(OBJEXT) \
quote_.$(OBJEXT) quotearg_.$(OBJEXT) realloc_.$(OBJEXT) \
stpcpy_.$(OBJEXT) strchr_.$(OBJEXT) strspn_.$(OBJEXT) \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_getargs_c,v 1.1 2003/01/18 20:34:35 pvalchev Exp $
--- src/getargs.c.orig Sat Jan 18 13:08:53 2003
+++ src/getargs.c Sat Jan 18 13:09:00 2003
@@ -19,7 +19,7 @@
02111-1307, USA. */
#include <stdio.h>
-#include "getopt.h"
+#include <getopt.h>
#include "system.h"
#include "files.h"
#include "complain.h"