diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-08 15:49:43 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-08 15:49:43 +0200 |
| commit | 72e736015f94d62211643ad1bedeeeacc77497db (patch) | |
| tree | 03a25534bd4a5ee522b30ef3d117740d41852e51 | |
| parent | c091d3fc473549b3762a727a59b83daefe4b8083 (diff) | |
| parent | 5c744e3b97188475d044dacb307e46276685c854 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/modules.mk | 1 | ||||
| -rw-r--r-- | package/dansguardian/Makefile | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 5722d9800..ae38b5f90 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -740,7 +740,6 @@ $(eval $(call KMOD_template,BLK_DEV_NBD,blk-dev-nbd,\ ,20)) $(eval $(call KMOD_template,SCSI,scsi,\ - $(MODULES_DIR)/kernel/drivers/scsi/scsi_wait_scan \ $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod \ ,20)) diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index d7991c2d7..86d8e979a 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -20,7 +20,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DANSGUARDIAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +ifeq ($(ADK_LINUX_AVR32),y) +LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc +else LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s +endif + ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) LIBRARIES+=-lssp endif |