pyrox.dev / nixpkgs
lol
fork atom

pgpool: fix darwin build

Fix the darwin build by removing the included copy from the Makefiles.

Stanisław Pitucha 927acf9a 48a0fb7a

+154
unified split
+148
pkgs/servers/sql/pgpool/darwin-strlcpy.patch
···
··· 1 + diff --git a/src/Makefile.in b/src/Makefile.in 2 + index 3b19ca27..4d2e8e52 100644 3 + --- a/src/Makefile.in 4 + +++ b/src/Makefile.in 5 + @@ -124,7 +124,7 @@ am_pgpool_OBJECTS = main/main.$(OBJEXT) main/pool_globals.$(OBJEXT) \ 6 + context/pool_query_context.$(OBJEXT) \ 7 + streaming_replication/pool_worker_child.$(OBJEXT) \ 8 + rewrite/pool_timestamp.$(OBJEXT) rewrite/pool_lobj.$(OBJEXT) \ 9 + - utils/pool_select_walker.$(OBJEXT) utils/strlcpy.$(OBJEXT) \ 10 + + utils/pool_select_walker.$(OBJEXT) \ 11 + utils/psprintf.$(OBJEXT) utils/pool_params.$(OBJEXT) \ 12 + utils/ps_status.$(OBJEXT) utils/pool_shmem.$(OBJEXT) \ 13 + utils/pool_sema.$(OBJEXT) utils/pool_signal.$(OBJEXT) \ 14 + @@ -469,7 +469,6 @@ pgpool_SOURCES = main/main.c \ 15 + rewrite/pool_timestamp.c \ 16 + rewrite/pool_lobj.c \ 17 + utils/pool_select_walker.c \ 18 + - utils/strlcpy.c \ 19 + utils/psprintf.c \ 20 + utils/pool_params.c \ 21 + utils/ps_status.c \ 22 + @@ -762,7 +761,6 @@ utils/$(am__dirstamp): 23 + @$(MKDIR_P) utils 24 + @: > utils/$(am__dirstamp) 25 + utils/pool_select_walker.$(OBJEXT): utils/$(am__dirstamp) 26 + -utils/strlcpy.$(OBJEXT): utils/$(am__dirstamp) 27 + utils/psprintf.$(OBJEXT): utils/$(am__dirstamp) 28 + utils/pool_params.$(OBJEXT): utils/$(am__dirstamp) 29 + utils/ps_status.$(OBJEXT): utils/$(am__dirstamp) 30 + diff --git a/src/libs/pcp/Makefile.in b/src/libs/pcp/Makefile.in 31 + index 5ea3213a..5689fb33 100644 32 + --- a/src/libs/pcp/Makefile.in 33 + +++ b/src/libs/pcp/Makefile.in 34 + @@ -129,7 +129,7 @@ libpcp_la_LIBADD = 35 + am__dirstamp = $(am__leading_dot)dirstamp 36 + dist_libpcp_la_OBJECTS = pcp.lo ../../utils/pool_path.lo \ 37 + ../../tools/fe_port.lo ../../tools/fe_memutils.lo \ 38 + - ../../utils/strlcpy.lo ../../utils/pool_health_check_stats.lo 39 + + ../../utils/pool_health_check_stats.lo 40 + nodist_libpcp_la_OBJECTS = pcp_stream.lo md5.lo json.lo 41 + libpcp_la_OBJECTS = $(dist_libpcp_la_OBJECTS) \ 42 + $(nodist_libpcp_la_OBJECTS) 43 + @@ -347,7 +347,6 @@ dist_libpcp_la_SOURCES = pcp.c \ 44 + ../../utils/pool_path.c \ 45 + ../../tools/fe_port.c \ 46 + ../../tools/fe_memutils.c \ 47 + - ../../utils/strlcpy.c \ 48 + ../../utils/pool_health_check_stats.c 49 + 50 + nodist_libpcp_la_SOURCES = pcp_stream.c \ 51 + @@ -437,7 +436,6 @@ clean-libLTLIBRARIES: 52 + @: > ../../tools/$(am__dirstamp) 53 + ../../tools/fe_port.lo: ../../tools/$(am__dirstamp) 54 + ../../tools/fe_memutils.lo: ../../tools/$(am__dirstamp) 55 + -../../utils/strlcpy.lo: ../../utils/$(am__dirstamp) 56 + ../../utils/pool_health_check_stats.lo: ../../utils/$(am__dirstamp) 57 + 58 + libpcp.la: $(libpcp_la_OBJECTS) $(libpcp_la_DEPENDENCIES) $(EXTRA_libpcp_la_DEPENDENCIES) 59 + diff --git a/src/tools/pgenc/Makefile.in b/src/tools/pgenc/Makefile.in 60 + index ad117a5e..5c5fc838 100644 61 + --- a/src/tools/pgenc/Makefile.in 62 + +++ b/src/tools/pgenc/Makefile.in 63 + @@ -101,7 +101,7 @@ PROGRAMS = $(bin_PROGRAMS) 64 + am__dirstamp = $(am__leading_dot)dirstamp 65 + dist_pg_enc_OBJECTS = pg_enc.$(OBJEXT) ../fe_port.$(OBJEXT) 66 + nodist_pg_enc_OBJECTS = ssl_utils.$(OBJEXT) md5.$(OBJEXT) \ 67 + - base64.$(OBJEXT) pool_passwd.$(OBJEXT) strlcpy.$(OBJEXT) \ 68 + + base64.$(OBJEXT) pool_passwd.$(OBJEXT) \ 69 + regex_array.$(OBJEXT) pool_config_variables.$(OBJEXT) \ 70 + pool_config.$(OBJEXT) fe_memutils.$(OBJEXT) \ 71 + pool_path.$(OBJEXT) 72 + @@ -320,7 +320,6 @@ nodist_pg_enc_SOURCES = ssl_utils.c \ 73 + md5.c \ 74 + base64.c \ 75 + pool_passwd.c \ 76 + - strlcpy.c \ 77 + regex_array.c \ 78 + pool_config_variables.c \ 79 + pool_config.c \ 80 + @@ -664,8 +663,6 @@ base64.h: ../../../src/include/utils/base64.h 81 + rm -f $@ && ln -s $< . 82 + ssl_utils.h: ../../../src/include/utils/ssl_utils.h 83 + rm -f $@ && ln -s $< . 84 + -strlcpy.c: ../../../src/utils/strlcpy.c 85 + - rm -f $@ && ln -s $< . 86 + regex_array.c: ../../../src/utils/regex_array.c 87 + rm -f $@ && ln -s $< . 88 + pool_config_variables.c: ../../../src/config/pool_config_variables.c 89 + diff --git a/src/tools/pgmd5/Makefile.in b/src/tools/pgmd5/Makefile.in 90 + index 275f39e5..d3af1e25 100644 91 + --- a/src/tools/pgmd5/Makefile.in 92 + +++ b/src/tools/pgmd5/Makefile.in 93 + @@ -101,7 +101,7 @@ PROGRAMS = $(bin_PROGRAMS) 94 + am__dirstamp = $(am__leading_dot)dirstamp 95 + dist_pg_md5_OBJECTS = pg_md5.$(OBJEXT) ../fe_port.$(OBJEXT) 96 + nodist_pg_md5_OBJECTS = md5.$(OBJEXT) pool_passwd.$(OBJEXT) \ 97 + - strlcpy.$(OBJEXT) regex_array.$(OBJEXT) \ 98 + + regex_array.$(OBJEXT) \ 99 + pool_config_variables.$(OBJEXT) pool_config.$(OBJEXT) \ 100 + fe_memutils.$(OBJEXT) pool_path.$(OBJEXT) 101 + pg_md5_OBJECTS = $(dist_pg_md5_OBJECTS) $(nodist_pg_md5_OBJECTS) 102 + @@ -317,7 +317,6 @@ dist_pg_md5_SOURCES = pg_md5.c \ 103 + 104 + nodist_pg_md5_SOURCES = md5.c \ 105 + pool_passwd.c \ 106 + - strlcpy.c \ 107 + regex_array.c \ 108 + pool_config_variables.c \ 109 + pool_config.c \ 110 + @@ -653,8 +652,6 @@ pool_passwd.c: ../../../src/auth/pool_passwd.c 111 + rm -f $@ && ln -s $< . 112 + pool_path.c: ../../../src/utils/pool_path.c 113 + rm -f $@ && ln -s $< . 114 + -strlcpy.c: ../../../src/utils/strlcpy.c 115 + - rm -f $@ && ln -s $< . 116 + regex_array.c: ../../../src/utils/regex_array.c 117 + rm -f $@ && ln -s $< . 118 + pool_config_variables.c: ../../../src/config/pool_config_variables.c 119 + diff --git a/src/tools/watchdog/Makefile.in b/src/tools/watchdog/Makefile.in 120 + index 3e578b44..c7fbce4e 100644 121 + --- a/src/tools/watchdog/Makefile.in 122 + +++ b/src/tools/watchdog/Makefile.in 123 + @@ -105,7 +105,7 @@ nodist_wd_cli_OBJECTS = ssl_utils.$(OBJEXT) wd_ipc_conn.$(OBJEXT) \ 124 + wd_commands.$(OBJEXT) json_writer.$(OBJEXT) json.$(OBJEXT) \ 125 + pool_config_variables.$(OBJEXT) pool_config.$(OBJEXT) \ 126 + pool_path.$(OBJEXT) fe_memutils.$(OBJEXT) stringinfo.$(OBJEXT) \ 127 + - strlcpy.$(OBJEXT) socket_stream.$(OBJEXT) \ 128 + + socket_stream.$(OBJEXT) \ 129 + regex_array.$(OBJEXT) psprintf.$(OBJEXT) md5.$(OBJEXT) 130 + wd_cli_OBJECTS = $(dist_wd_cli_OBJECTS) $(nodist_wd_cli_OBJECTS) 131 + wd_cli_LDADD = $(LDADD) 132 + @@ -359,7 +359,6 @@ nodist_wd_cli_SOURCES = ssl_utils.c \ 133 + fe_memutils.c \ 134 + stringinfo.h \ 135 + stringinfo.c \ 136 + - strlcpy.c \ 137 + socket_stream.c \ 138 + regex_array.c \ 139 + psprintf.c \ 140 + @@ -732,8 +731,6 @@ md5.h: ../../../src/include/auth/md5.h 141 + rm -f $@ && ln -s $< . 142 + socket_stream.c: ../../../src/utils/socket_stream.c 143 + rm -f $@ && ln -s $< . 144 + -strlcpy.c: ../../../src/utils/strlcpy.c 145 + - rm -f $@ && ln -s $< . 146 + regex_array.c: ../../../src/utils/regex_array.c 147 + rm -f $@ && ln -s $< . 148 + wd_ipc_conn.c: ../../../src/watchdog/wd_ipc_conn.c
+6
pkgs/servers/sql/pgpool/default.nix
··· 34 "sysconfdir=\${out}/etc" 35 ]; 36 37 enableParallelBuilding = true; 38 39 meta = with lib; {
··· 34 "sysconfdir=\${out}/etc" 35 ]; 36 37 + patches = lib.optionals (stdenv.isDarwin) [ 38 + # Build checks for strlcpy being available in the system, but doesn't 39 + # actually exclude its own copy from being built 40 + ./darwin-strlcpy.patch 41 + ]; 42 + 43 enableParallelBuilding = true; 44 45 meta = with lib; {