Re: [Buildroot] [PATCH] package/sqlite: fix build issue since bump to 3.49.0

From: Baruch Siach via buildroot <buildroot@buildroot.org>
To: Scott Fan <fancp2007@gmail.com>
Cc: buildroot@buildroot.org,  Bernd Kuhls <bernd@kuhls.net>,
	 Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: Re: [Buildroot] [PATCH] package/sqlite: fix build issue since bump to 3.49.0
Date: Wed, 12 Feb 2025 16:24:45 +0200	[thread overview]
Message-ID: <87tt8znsuq.fsf@tarshish> (raw)
In-Reply-To: <20250212135027.759121-1-fancp2007@gmail.com> (Scott Fan's message of "Wed, 12 Feb 2025 21:50:25 +0800")

Hi Scott,

On Wed, Feb 12 2025, Scott Fan wrote:
> As of release 3.49.0, the author has replaced the configure script used in
> the precompiled amalgamation tarball with Autosetup instead of Autotools.
>
> Fixes:
>   https://autobuild.buildroot.org/?reason=sqlite-3.49.0
>
> Signed-off-by: Scott Fan <fancp2007@gmail.com>
> ---
>  package/sqlite/sqlite.mk | 59 ++++++++++++++++++++++++----------------
>  1 file changed, 36 insertions(+), 23 deletions(-)
>
> diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
> index a23f6e1d66..30385f9821 100644
> --- a/package/sqlite/sqlite.mk
> +++ b/package/sqlite/sqlite.mk
> @@ -21,14 +21,6 @@ ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_COLUMN_METADATA),y)
>  SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA
>  endif
>  
> -ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y)
> -SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3
> -endif
> -
> -ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_JSON1),y)
> -SQLITE_CFLAGS += -DSQLITE_ENABLE_JSON1
> -endif
> -
>  ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY),y)
>  SQLITE_CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY
>  endif
> @@ -50,30 +42,51 @@ else
>  SQLITE_CFLAGS += $(subst -Ofast,-O3,$(TARGET_CFLAGS))
>  endif
>  
> -SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)"
> -
> -ifeq ($(BR2_STATIC_LIBS),y)
> -SQLITE_CONF_OPTS += --enable-dynamic-extensions=no
> -else
> -SQLITE_CONF_OPTS += --disable-static-shell
> -endif
> -
>  ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
> -SQLITE_CONF_OPTS += --enable-threadsafe
> +SQLITE_CFLAGS += -DSQLITE_THREADSAFE=1
>  else
>  SQLITE_CONF_OPTS += --disable-threadsafe
> -SQLITE_CFLAGS += -DSQLITE_THREADSAFE=0
>  endif
>  
>  ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy)
>  SQLITE_DEPENDENCIES += ncurses readline
> -SQLITE_CONF_OPTS += --disable-editline --enable-readline
>  else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
>  SQLITE_DEPENDENCIES += libedit
> -SQLITE_CONF_OPTS += --enable-editline --disable-readline
> +SQLITE_CONF_OPTS += --disable-readline --editline
>  else
> -SQLITE_CONF_OPTS += --disable-editline --disable-readline
> +SQLITE_CONF_OPTS += --disable-readline
>  endif
>  
> -$(eval $(autotools-package))
> -$(eval $(host-autotools-package))
> +ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y)
> +SQLITE_CONF_OPTS += --fts3
> +endif
> +
> +ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_JSON1),)
> +SQLITE_CONF_OPTS += --disable-json
> +endif
> +
> +SQLITE_CONF_ENV = CFLAGS="$(SQLITE_CFLAGS)"
> +
> +define SQLITE_CONFIGURE_CMDS
> +	(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SQLITE_CONF_ENV) ./configure \
> +		--prefix=/usr \
> +		--host="$(GNU_TARGET_NAME)" \
> +		--build="$(GNU_HOST_NAME)" \
> +		--sysroot="$(STAGING_DIR)" \
> +		$(SQLITE_CONF_OPTS) \
> +	)
> +endef
> +
> +define SQLITE_BUILD_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
> +endef
> +
> +define SQLITE_INSTALL_STAGING_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install
> +endef
> +
> +define SQLITE_INSTALL_TARGET_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install
> +endef
> +
> +$(eval $(generic-package))

We also need host-generic-package to replace the host-autotools-package
removed above.

baruch

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot