Skip to content
Snippets Groups Projects
Commit b150906b authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files

We don't need config.status substituting anything into Gen_fmgrtab.sh, we 

just pass in CPP and AWK via the environment from the Makefile.
parent 9e8d5918
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
configure
+ 0
− 2
View file @ b150906b
...@@ -8902,7 +8902,6 @@ trap 'rm -fr `echo "GNUmakefile ...@@ -8902,7 +8902,6 @@ trap 'rm -fr `echo "GNUmakefile
src/Makefile.global src/Makefile.global
src/backend/port/Makefile src/backend/port/Makefile
src/backend/catalog/genbki.sh src/backend/catalog/genbki.sh
src/backend/utils/Gen_fmgrtab.sh
src/include/version.h src/include/version.h
src/test/regress/GNUmakefile src/test/regress/GNUmakefile
src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
...@@ -9073,7 +9072,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile ...@@ -9073,7 +9072,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
src/Makefile.global src/Makefile.global
src/backend/port/Makefile src/backend/port/Makefile
src/backend/catalog/genbki.sh src/backend/catalog/genbki.sh
src/backend/utils/Gen_fmgrtab.sh
src/include/version.h src/include/version.h
src/test/regress/GNUmakefile src/test/regress/GNUmakefile
"} "}
......
configure.in
+ 0
− 1
View file @ b150906b
...@@ -1198,7 +1198,6 @@ AC_OUTPUT( ...@@ -1198,7 +1198,6 @@ AC_OUTPUT(
src/Makefile.global src/Makefile.global
src/backend/port/Makefile src/backend/port/Makefile
src/backend/catalog/genbki.sh src/backend/catalog/genbki.sh
src/backend/utils/Gen_fmgrtab.sh
src/include/version.h src/include/version.h
src/test/regress/GNUmakefile src/test/regress/GNUmakefile
) )
src/GNUmakefile.in
+ 1
− 2
View file @ b150906b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.54 2000/06/28 18:29:13 petere Exp $ # $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.55 2000/07/01 21:16:42 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -54,7 +54,6 @@ distclean maintainer-clean: ...@@ -54,7 +54,6 @@ distclean maintainer-clean:
-$(MAKE) -C utils clean -$(MAKE) -C utils clean
-$(MAKE) -C backend clean -$(MAKE) -C backend clean
rm -f backend/port/Makefile backend/catalog/genbki.sh \ rm -f backend/port/Makefile backend/catalog/genbki.sh \
backend/utils/Gen_fmgrtab.sh \
backend/port/tas.s backend/port/dynloader.c backend/port/tas.s backend/port/dynloader.c
-$(MAKE) -C interfaces $@ -$(MAKE) -C interfaces $@
-$(MAKE) -C bin $@ -$(MAKE) -C bin $@
......
src/Makefile.global.in
+ 2
− 1
View file @ b150906b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.83 2000/07/01 15:02:16 petere Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.84 2000/07/01 21:16:42 petere Exp $
# #
# NOTES # NOTES
# Essentially all Postgres make files include this file and use the # Essentially all Postgres make files include this file and use the
...@@ -183,6 +183,7 @@ LN_S= @LN_S@ ...@@ -183,6 +183,7 @@ LN_S= @LN_S@
TAR= @tar@ TAR= @tar@
GZCAT= @GZCAT@ GZCAT= @GZCAT@
PERL = @PERL@ PERL = @PERL@
AWK = @AWK@
CXX=@CXX@ CXX=@CXX@
CXXFLAGS=@CXXFLAGS@ @INCLUDES@ CXXFLAGS=@CXXFLAGS@ @INCLUDES@
......
src/backend/utils/Gen_fmgrtab.sh.in → src/backend/utils/Gen_fmgrtab.sh
+ 16
− 29
View file @ b150906b
...@@ -9,17 +9,17 @@ ...@@ -9,17 +9,17 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.25 2000/06/07 16:26:48 petere Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.15 2000/07/01 21:16:44 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
CMDNAME=`basename $0` CMDNAME=`basename $0`
AWK="@AWK@" : ${AWK='awk'}
CPP="@CPP@" : ${CPP='cc -E'}
cleanup(){ cleanup(){
[ x"$noclean" != x"t" ] && rm -f "$CPPTMPFILE" "$RAWFILE" "$OIDSFILE.tmp" "$TABLEFILE.tmp" [ x"$noclean" != x"t" ] && rm -f "$CPPTMPFILE" "$RAWFILE"
} }
BKIOPTS= BKIOPTS=
...@@ -46,6 +46,10 @@ do ...@@ -46,6 +46,10 @@ do
echo "Usage:" echo "Usage:"
echo " $CMDNAME [ -D define [...] ]" echo " $CMDNAME [ -D define [...] ]"
echo echo
echo "The environment variables CPP and AWK determine which C"
echo "preprocessor and Awk program to use. The defaults are"
echo "\`cc -E' and \`awk'."
echo
echo "Report bugs to <pgsql-bugs@postgresql.org>." echo "Report bugs to <pgsql-bugs@postgresql.org>."
exit 0 exit 0
;; ;;
...@@ -119,7 +123,7 @@ cpp_define=`echo $OIDSFILE | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTU ...@@ -119,7 +123,7 @@ cpp_define=`echo $OIDSFILE | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTU
# #
# Generate fmgroids.h # Generate fmgroids.h
# #
cat > "${OIDSFILE}.tmp" <<FuNkYfMgRsTuFf cat > "$OIDSFILE" <<FuNkYfMgRsTuFf
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* *
* $OIDSFILE * $OIDSFILE
...@@ -160,7 +164,7 @@ FuNkYfMgRsTuFf ...@@ -160,7 +164,7 @@ FuNkYfMgRsTuFf
tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' < $RAWFILE | \ tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' < $RAWFILE | \
$AWK ' $AWK '
BEGIN { OFS = ""; } BEGIN { OFS = ""; }
{ if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }' >> "${OIDSFILE}.tmp" { if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }' >> "$OIDSFILE"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
cleanup cleanup
...@@ -168,7 +172,7 @@ if [ $? -ne 0 ]; then ...@@ -168,7 +172,7 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
cat >> "${OIDSFILE}.tmp" <<FuNkYfMgRsTuFf cat >> "$OIDSFILE" <<FuNkYfMgRsTuFf
#endif /* $cpp_define */ #endif /* $cpp_define */
FuNkYfMgRsTuFf FuNkYfMgRsTuFf
...@@ -182,7 +186,7 @@ FuNkYfMgRsTuFf ...@@ -182,7 +186,7 @@ FuNkYfMgRsTuFf
# this table definition as a separate C file that won't need to include any # this table definition as a separate C file that won't need to include any
# "real" declarations for those functions! # "real" declarations for those functions!
# #
cat > "${TABLEFILE}.tmp" <<FuNkYfMgRtAbStUfF cat > "$TABLEFILE" <<FuNkYfMgRtAbStUfF
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* *
* $TABLEFILE * $TABLEFILE
...@@ -213,7 +217,7 @@ cat > "${TABLEFILE}.tmp" <<FuNkYfMgRtAbStUfF ...@@ -213,7 +217,7 @@ cat > "${TABLEFILE}.tmp" <<FuNkYfMgRtAbStUfF
FuNkYfMgRtAbStUfF FuNkYfMgRtAbStUfF
$AWK '{ print "extern Datum", $(NF-1), "(PG_FUNCTION_ARGS);"; }' $RAWFILE >> "${TABLEFILE}.tmp" $AWK '{ print "extern Datum", $(NF-1), "(PG_FUNCTION_ARGS);"; }' $RAWFILE >> "$TABLEFILE"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
cleanup cleanup
...@@ -222,7 +226,7 @@ if [ $? -ne 0 ]; then ...@@ -222,7 +226,7 @@ if [ $? -ne 0 ]; then
fi fi
cat >> "${TABLEFILE}.tmp" <<FuNkYfMgRtAbStUfF cat >> "$TABLEFILE" <<FuNkYfMgRtAbStUfF
const FmgrBuiltin fmgr_builtins[] = { const FmgrBuiltin fmgr_builtins[] = {
FuNkYfMgRtAbStUfF FuNkYfMgRtAbStUfF
...@@ -239,7 +243,7 @@ $AWK 'BEGIN { ...@@ -239,7 +243,7 @@ $AWK 'BEGIN {
} }
{ printf (" { %d, \"%s\", %d, %s, %s, %s },\n"), \ { printf (" { %d, \"%s\", %d, %s, %s, %s },\n"), \
$1, $(NF-1), $9, Strict[$8], OldStyle[$4], $(NF-1) $1, $(NF-1), $9, Strict[$8], OldStyle[$4], $(NF-1)
}' $RAWFILE >> "${TABLEFILE}.tmp" }' $RAWFILE >> "$TABLEFILE"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
cleanup cleanup
...@@ -247,7 +251,7 @@ if [ $? -ne 0 ]; then ...@@ -247,7 +251,7 @@ if [ $? -ne 0 ]; then
exit 1 exit 1
fi fi
cat >> "${TABLEFILE}.tmp" <<FuNkYfMgRtAbStUfF cat >> "$TABLEFILE" <<FuNkYfMgRtAbStUfF
/* dummy entry is easier than getting rid of comma after last real one */ /* dummy entry is easier than getting rid of comma after last real one */
/* (not that there has ever been anything wrong with *having* a /* (not that there has ever been anything wrong with *having* a
comma after the last field in an array initializer) */ comma after the last field in an array initializer) */
...@@ -259,22 +263,5 @@ const int fmgr_nbuiltins = (sizeof(fmgr_builtins) / sizeof(FmgrBuiltin)) - 1; ...@@ -259,22 +263,5 @@ const int fmgr_nbuiltins = (sizeof(fmgr_builtins) / sizeof(FmgrBuiltin)) - 1;
FuNkYfMgRtAbStUfF FuNkYfMgRtAbStUfF
# Now we check if the files fmgroids.h and fmgrtab.c already exist and
# are identical to what we would make them. In that case we avoid
# writing our new version, so as to not cause unnecessary recompilation
# because of changed timestamps.
for file in "$OIDSFILE" "$TABLEFILE" ; do
if test -f "$file" && cmp -s "$file" "${file}.tmp" ; then
echo "$file unchanged"
rm -f "${file}.tmp"
else
mv "${file}.tmp" "$file"
fi
done
cleanup cleanup
exit 0 exit 0
src/backend/utils/Makefile
+ 2
− 2
View file @ b150906b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Makefile for utils # Makefile for utils
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.15 2000/06/17 00:09:43 petere Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.16 2000/07/01 21:16:44 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
...@@ -34,7 +34,7 @@ submake: ...@@ -34,7 +34,7 @@ submake:
fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h
$(SHELL) $(SHOPTS) Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(SRCDIR)/include/catalog/pg_proc.h
clean: clean:
......
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