Radish alpha
H
HardenedBSD-pkg
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Rework configure system to use multiple repo types.
Vsevolod Stakhov committed 11 years ago
commit 51b81b01762254328758f28b108be4a6c161cc64
parent 324cdd12c9be01e6c105fc5193ec2925b346d0fa
4 files changed +36 -2
modified configure.ac
@@ -229,13 +229,40 @@ AC_SUBST([TESTS])
AC_SUBST([LDNS_LIBS])

AC_SUBST([LDNS_CFLAGS])
+ 
dnl We now support merely binary repos
+ 
m4_define([repos], [binary])
+ 
m4_define([repos_ldadd], [])
+ 
m4_define([repos_makefiles], [])
+ 
m4_define([repos_ldadd_static], [])
+
+ 
dnl Add ldadd for repo
+ 
m4_define([repos_add_ldadd], [
+ 
	m4_append([$1], [m4_join([], [ \], m4_newline(), [    repo/],
+ 
		[$3], [/repo_],
+ 
		[$3], [$2.la])])
+ 
])
+ 
dnl Create makefile definition for repo
+ 
m4_define([repos_add_makefile], [
+ 
	m4_append([$1], [m4_join([], [ \], m4_newline(), [    libpkg/repo/],
+ 
		[$2], [/Makefile])])
+ 
])
+ 
dnl Apply macros to repos list
+ 
m4_map([m4_curry([repos_add_ldadd], [repos_ldadd], [])], [repos])
+ 
m4_map([m4_curry([repos_add_ldadd], [repos_ldadd_static], [_static])], [repos])
+ 
m4_map([m4_curry([repos_add_makefile], [repos_makefiles])], [repos])
+
+ 
AC_SUBST([REPOS], m4_expand([repos]))
+ 
AC_SUBST([REPOS_LDADD], m4_expand([repos_ldadd]))
+ 
AC_SUBST([REPOS_LDADD_STATIC], m4_expand([repos_ldadd_static]))
+ 


AC_CONFIG_FILES(Makefile \

		src/Makefile \

		external/Makefile \

		scripts/Makefile \

		docs/Makefile \

		tests/Makefile \
- 
		libpkg/Makefile
+ 
		libpkg/Makefile \
+ 
		libpkg/repo/Makefile \

		libpkg/pkg.h \

		libpkg/pkg.pc

		scripts/periodic/400.status-pkg
@@ -246,6 +273,8 @@ AC_CONFIG_FILES(Makefile \
		scripts/sbin/pkg2ng

		scripts/completion/_pkg.bash

		scripts/completion/_pkg.zsh)
+ 
AC_CONFIG_FILES(m4_expand([repos_makefiles]))
+ 


AC_CONFIG_HEADERS(pkg_config.h)



AC_OUTPUT
modified libpkg/Makefile.am
@@ -54,6 +54,7 @@ libpkg_la_LIBADD= $(top_builddir)/external/libucl.la \
			$(top_builddir)/external/libsqlite.la \

			$(top_builddir)/external/libyaml.la \

			$(top_builddir)/external/libexpat.la \
+ 
			@REPOS_LDADD@ \

			@LIBELF_LIB@ \

			@LIBSBUF_LIB@ \

			@LIBEXECINFO_LIB@ \
@@ -73,7 +74,8 @@ libpkg_static_la_CFLAGS= $(pkg_common_cflags) -static
libpkg_static_la_LIBADD=	$(top_builddir)/external/libucl_static.la \

			$(top_builddir)/external/libsqlite_static.la \

			$(top_builddir)/external/libexpat_static.la \
- 
			$(top_builddir)/external/libyaml_static.la
+ 
			$(top_builddir)/external/libyaml_static.la \
+ 
			@REPOS_LDADD_STATIC@



libpkg_static_la_LDFLAGS=	-all-static
@@ -87,3 +89,5 @@ noinst_HEADERS= private/db_upgrades.h \
			private/repodb.h \

			private/thd_repo.h \

			private/utils.h
+
+ 
SUBDIRS = repo .
 

\ No newline at end of file
added libpkg/repo/Makefile.am
@@ -0,0 +1 @@
+ 
SUBDIRS = @REPOS@
 

\ No newline at end of file
added libpkg/repo/binary/Makefile.am