From 51e8287dde18d7bc22f683dbd5f4ed4d20c44fa0 Mon Sep 17 00:00:00 2001 From: stephan Date: Tue, 1 Oct 2024 11:09:50 +0000 Subject: [PATCH] Correct missing LDFLAGS_ZLIB for libsqlite3.so. FossilOrigin-Name: 98bbba3a05734e080a0c8c51fac0368436809d4ff3c39959a51970400b4470cb --- Makefile.in | 3 ++- manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8b59372d31..8903e93245 100644 --- a/Makefile.in +++ b/Makefile.in @@ -728,7 +728,8 @@ sqlite_cfg.h: $(TOP)/sqlite_cfg.h.in $(AS_AUTO_DEF) libsqlite3.DLL = libsqlite3$(TDLL) libsqlite3.LIB = libsqlite3$(TLIB) -LDFLAGS_libsqlite = $(LDFLAGS_RPATH) $(TLIBS) $(LDFLAGS_MATH) +LDFLAGS_libsqlite = \ + $(LDFLAGS_RPATH) $(TLIBS) $(LDFLAGS_MATH) $(LDFLAGS_ZLIB) $(libsqlite3.DLL): $(LIBOBJ) $(TLINK) -o $@ \ diff --git a/manifest b/manifest index 489e98e6ef..4d9fabd511 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Fix\sreversed\slogic\sin\sthe\sbuild/target/host\snames\sin\sseveral\shwaci-*\sfunctions. -D 2024-10-01T11:04:02.571 +C Correct\smissing\sLDFLAGS_ZLIB\sfor\slibsqlite3.so. +D 2024-10-01T11:09:50.892 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in c766d3b7c308091e94c57836b6f8933b3afe6f29643ec4c95af55a8fbe586617 +F Makefile.in 03b37ca1ca620ae9074bf79c6f3357a54f2fe8f9befee918aa52b107d78b4040 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6 F Makefile.msc 9c6d80d9d103fa42e931f4c464884a5e577fae8563acc7589bff4e43fbe8f864 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -2233,8 +2233,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P ddfda58004fa3e43c4f2d497c6feecbea3b195d14196bf179f4aafd21ea089ea -R c63f6b95b69f924ec60d866a54529dc8 +P fde7257ad9ce84be6d907be3c6d277b04dd9466ee6828bfded4cfefc86db22db +R 04bf171d78ee7f138b5f990ba32f5afc U stephan -Z 38ecc5a009d6d90955debf1069637c2a +Z 22b8ec3ae34f09b70dd7dcbd99830d71 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index f9db5f1c9f..8922f9e1a1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fde7257ad9ce84be6d907be3c6d277b04dd9466ee6828bfded4cfefc86db22db +98bbba3a05734e080a0c8c51fac0368436809d4ff3c39959a51970400b4470cb -- 2.47.2