diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-14 16:19:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-14 16:19:57 +0200 |
| commit | 0ae09b6000f99736f56cd3fc701855d474a31746 (patch) | |
| tree | 8d40d69a9b5c1ac597b69fcf9b2532d7a2c10cc1 /mk | |
| parent | 3e16daee39b50bfccf4d389385f8748da016cdcc (diff) | |
| parent | ac01f0d24321933d3456190164f5b68ccc94976a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/mirrors.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mk/mirrors.mk b/mk/mirrors.mk index f38bd7d40..d820a56b3 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -42,7 +42,6 @@ MASTER_SITE_GNU?= \ ftp://ftp.sunet.se/pub/gnu/ \ MASTER_SITE_SOURCEFORGE?= \ - http://easynews.dl.sourceforge.net/sourceforge/ \ http://puzzle.dl.sourceforge.net/sourceforge/ \ http://optusnet.dl.sourceforge.net/sourceforge/ \ http://heanet.dl.sourceforge.net/sourceforge/ \ @@ -55,6 +54,7 @@ MASTER_SITE_SOURCEFORGE?= \ http://ovh.dl.sourceforge.net/sourceforge/ \ http://surfnet.dl.sourceforge.net/sourceforge/ \ http://ufpr.dl.sourceforge.net/sourceforge/ \ + http://easynews.dl.sourceforge.net/sourceforge/ \ MASTER_SITE_MYSQL?= \ ftp://ftp.fu-berlin.de/unix/databases/mysql/ \ diff --git a/mk/vars.mk b/mk/vars.mk index 2b50b9e5a..43371edc2 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -69,7 +69,8 @@ TARGET_LD:= ${TARGET_COMPILER_PREFIX}ld TARGET_CPPFLAGS:= TARGET_CFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -TARGET_LDFLAGS:= -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ +TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ + -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib ifneq ($(ADK_NATIVE),) @@ -198,7 +199,7 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget --timeout=30 -t 3 $(QUIET) +FETCH_CMD?= wget --timeout=5 -t 3 $(QUIET) ifeq ($(ADK_HOST_CYGWIN),y) EXEEXT:= .exe |