Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #169 from champtar/freeradius2

Browse source 
freeradius2: remove weird circular dependencies, enable mysql again
This commit is contained in:
champtar 2014-09-02 20:08:41 +02:00
commit 809ab9f6ad
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
net/freeradius2/Makefile
View file

@ -218,7 +218,7 @@ endef
define Package/freeradius2-mod-ldap define Package/freeradius2-mod-ldap
$(call Package/freeradius2/Default) $(call Package/freeradius2/Default)
DEPENDS:=freeradius2 +PACKAGE_freeradius2-mod-ldap:libopenldap DEPENDS:=freeradius2 +libopenldap
TITLE:=LDAP module TITLE:=LDAP module
endef endef
@ -292,22 +292,19 @@ endef
define Package/freeradius2-mod-sql-mysql define Package/freeradius2-mod-sql-mysql
$(call Package/freeradius2/Default) $(call Package/freeradius2/Default)
DEPENDS:=freeradius2-mod-sql \ DEPENDS:=freeradius2-mod-sql +libmysqlclient-r
+PACKAGE_freeradius2-mod-sql-mysql:libmysqlclient-r
TITLE:=MySQL module TITLE:=MySQL module
endef endef
define Package/freeradius2-mod-sql-pgsql define Package/freeradius2-mod-sql-pgsql
$(call Package/freeradius2/Default) $(call Package/freeradius2/Default)
DEPENDS:=freeradius2-mod-sql \ DEPENDS:=freeradius2-mod-sql +libpq
+PACKAGE_freeradius2-mod-sql-pgsql:libpq
TITLE:=PostgreSQL module TITLE:=PostgreSQL module
endef endef
define Package/freeradius2-mod-sql-sqlite define Package/freeradius2-mod-sql-sqlite
$(call Package/freeradius2/Default) $(call Package/freeradius2/Default)
DEPENDS:=freeradius2-mod-sql \ DEPENDS:=freeradius2-mod-sql +libsqlite3
+PACKAGE_freeradius2-mod-sql-sqlite:libsqlite3
TITLE:=SQLite module TITLE:=SQLite module
endef endef
@ -427,15 +424,15 @@ else
CONFIGURE_ARGS+= --without-rlm_ldap CONFIGURE_ARGS+= --without-rlm_ldap
endif endif
#ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-mysql),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-mysql),)
# CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
# --with-mysql-include-dir="$(STAGING_DIR)/usr/include" \ --with-mysql-include-dir="$(STAGING_DIR)/usr/include" \
# --with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql" --with-mysql-lib-dir="$(STAGING_DIR)/usr/lib/mysql"
# CONFIGURE_LIBS+= -lz CONFIGURE_LIBS+= -lz
# CONFIGURE_VARS+= ac_cv_lib_mysqlclient_r_mysql_init=yes CONFIGURE_VARS+= ac_cv_lib_mysqlclient_r_mysql_init=yes
#else else
CONFIGURE_ARGS+= --without-rlm_sql_mysql CONFIGURE_ARGS+= --without-rlm_sql_mysql
#endif endif
ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-pgsql),) ifneq ($(SDK)$(CONFIG_PACKAGE_freeradius2-mod-sql-pgsql),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
@ -621,7 +618,7 @@ $(eval $(call BuildPlugin,freeradius2-mod-pap,rlm_pap,modules/pap,modules,))
$(eval $(call BuildPlugin,freeradius2-mod-preprocess,rlm_preprocess,hints huntgroups modules/preprocess,modules,)) $(eval $(call BuildPlugin,freeradius2-mod-preprocess,rlm_preprocess,hints huntgroups modules/preprocess,modules,))
$(eval $(call BuildPlugin,freeradius2-mod-realm,rlm_realm,proxy.conf modules/realm modules/inner-eap,modules,)) $(eval $(call BuildPlugin,freeradius2-mod-realm,rlm_realm,proxy.conf modules/realm modules/inner-eap,modules,))
$(eval $(call BuildPlugin,freeradius2-mod-sql,rlm_sql,sql.conf,)) $(eval $(call BuildPlugin,freeradius2-mod-sql,rlm_sql,sql.conf,))
#$(eval $(call BuildPlugin,freeradius2-mod-sql-mysql,rlm_sql_mysql,)) $(eval $(call BuildPlugin,freeradius2-mod-sql-mysql,rlm_sql_mysql,))
$(eval $(call BuildPlugin,freeradius2-mod-sql-pgsql,rlm_sql_postgresql,)) $(eval $(call BuildPlugin,freeradius2-mod-sql-pgsql,rlm_sql_postgresql,))
$(eval $(call BuildPlugin,freeradius2-mod-sql-sqlite,rlm_sql_sqlite,)) $(eval $(call BuildPlugin,freeradius2-mod-sql-sqlite,rlm_sql_sqlite,))
$(eval $(call BuildPlugin,freeradius2-mod-sqlcounter,rlm_sqlcounter,)) $(eval $(call BuildPlugin,freeradius2-mod-sqlcounter,rlm_sqlcounter,))