source16.patch 2.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172
  1. --- src/backend/Makefile.orig 2024-05-06 20:21:25.000000000 +0000
  2. +++ src/backend/Makefile 2024-07-10 14:42:54.595667140 +0000
  3. @@ -23,6 +23,8 @@
  4. statistics storage tcop tsearch utils $(top_builddir)/src/timezone \
  5. jit
  6. +SUBDIRS := $(filter-out main,$(SUBDIRS))
  7. +
  8. include $(srcdir)/common.mk
  9. # As of 1/2010:
  10. @@ -58,14 +60,15 @@
  11. ##########################################################################
  12. -all: submake-libpgport submake-catalog-headers submake-utils-headers postgres $(POSTGRES_IMP)
  13. +all: submake-libpgport submake-catalog-headers submake-utils-headers postgres.a $(POSTGRES_IMP)
  14. ifneq ($(PORTNAME), cygwin)
  15. ifneq ($(PORTNAME), win32)
  16. ifneq ($(PORTNAME), aix)
  17. -postgres: $(OBJS)
  18. - $(CC) $(CFLAGS) $(call expand_subsys,$^) $(LDFLAGS) $(LIBS) -o $@
  19. +postgres.a: $(OBJS)
  20. + $(AR) $(AROPT) $@ $(call expand_subsys,$^)
  21. +
  22. endif
  23. endif
  24. @@ -272,7 +275,7 @@
  25. ##########################################################################
  26. clean:
  27. - rm -f $(LOCALOBJS) postgres$(X) $(POSTGRES_IMP)
  28. + rm -f $(LOCALOBJS) postgres$(X) postgres.a $(POSTGRES_IMP)
  29. ifeq ($(PORTNAME), cygwin)
  30. rm -f postgres.dll libpostgres.a
  31. endif
  32. --- src/common/Makefile.orig 2024-07-10 14:55:42.572326502 +0000
  33. +++ src/common/Makefile 2024-07-10 14:55:50.711376079 +0000
  34. @@ -119,7 +119,7 @@
  35. GEN_KEYWORDLIST = $(PERL) -I $(TOOLSDIR) $(TOOLSDIR)/gen_keywordlist.pl
  36. GEN_KEYWORDLIST_DEPS = $(TOOLSDIR)/gen_keywordlist.pl $(TOOLSDIR)/PerfectHash.pm
  37. -all: libpgcommon.a libpgcommon_shlib.a libpgcommon_srv.a
  38. +all: libpgcommon_srv.a
  39. distprep: kwlist_d.h
  40. --- src/port/Makefile.orig 2024-07-10 14:53:25.259490507 +0000
  41. +++ src/port/Makefile 2024-07-10 14:53:42.240593851 +0000
  42. @@ -66,7 +66,7 @@
  43. OBJS_SHLIB = $(OBJS:%.o=%_shlib.o)
  44. OBJS_SRV = $(OBJS:%.o=%_srv.o)
  45. -all: libpgport.a libpgport_shlib.a libpgport_srv.a
  46. +all: libpgport_srv.a
  47. # libpgport is needed by some contrib
  48. install: all installdirs
  49. --- src/timezone/Makefile.orig 2024-07-10 14:54:07.099745159 +0000
  50. +++ src/timezone/Makefile 2024-07-10 14:54:16.472802216 +0000
  51. @@ -40,7 +40,7 @@
  52. include $(top_srcdir)/src/backend/common.mk
  53. ifeq (,$(with_system_tzdata))
  54. -all: zic
  55. +all:
  56. endif
  57. # We could do this test in the action section: