diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2021-10-26 10:44:36 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-10-28 16:31:44 +0100 |
| commit | c3c6a2ff1d231e10e593956c004430af9f8687b5 (patch) | |
| tree | 8c11a0e2918e9ccf17d504f05f71c5e5bb18d3cd /net/gnunet/Makefile | |
| parent | 1a5d35dd7b1c60b24190b42a6fdf46d9c237a3b2 (diff) | |
gnunet: several improvements
Fix uci-defaults for PostgreSQL backends
Add user 'gnunet' to 'postgres' group
Always build with sqlite3 as configure fails when --without-sqlite
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'net/gnunet/Makefile')
| -rw-r--r-- | net/gnunet/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile index fb7f204db..0f772defc 100644 --- a/net/gnunet/Makefile +++ b/net/gnunet/Makefile @@ -17,16 +17,20 @@ PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=gettext-version PKG_INSTALL:=1 +# despite configure fails if sqlite3 isn't detected +PKG_BUILD_DEPENDS:=sqlite3 + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +# always pass --with-sqlite as configure fails when trying --without-sqlite CONFIGURE_ARGS+= \ --with-libiconv-prefix="$(ICONV_PREFIX)" \ --with-libintl-prefix="$(INTL_PREFIX)" \ --with-ltdl \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mysql),--with-mysql="$(STAGING_DIR)/usr",--without-mysql) \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-pgsql),--with-postgresql="$(STAGING_DIR)/usr/bin/pg_config",--without-postgresql) \ - $(if $(CONFIG_PACKAGE_libsqlite3),--with-sqlite="$(STAGING_DIR)/usr",--without-sqlite) \ + --with-sqlite="$(STAGING_DIR)/usr" \ --enable-testing \ --disable-testruns \ --disable-documentation \ @@ -315,8 +319,9 @@ DEPENDS_fs-mysql:=+gnunet-mysql +gnunet-datastore PLUGIN_fs-mysql:=datastore_mysql CONFLICTS_fs-mysql:=gnunet-fs-pgsql gnunet-fs-sqlite -DEPENDS_pgsql:=+libpq +DEPENDS_pgsql:=+libpq +pgsql-server LIB_pgsql:=pq +USERID_pgsql:=gnunet=958::postgres=5432 DEPENDS_dhtcache-pgsql:=+gnunet-pgsql PLUGIN_dhtcache-pgsql:=datacache_postgres |