diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-10 18:29:50 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-03-10 18:29:50 +0100 |
| commit | c0011b3b7074f8b47cbec36177eff42b18871d4d (patch) | |
| tree | 8bedce53f4bee4d288fdca28352fb6bff85dfc7f /package/elinks | |
| parent | e04d6dc7eff54a2b851b65dd6cbcc78b8f573f64 (diff) | |
| parent | 3d2e9517d920b88abde391b59ca0069351be3a87 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/elinks')
| -rw-r--r-- | package/elinks/Makefile | 4 | ||||
| -rw-r--r-- | package/elinks/patches/patch-Makefile_lib | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/package/elinks/Makefile b/package/elinks/Makefile index b2d0c6014..a555a5db6 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= elinks PKG_VERSION:= 0.11.7 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 145c510cae41c204d0f23dce4bdd23ab PKG_DESCR:= advanced text web browser PKG_SECTION:= text @@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --enable-small \ --without-spidermonkey \ --without-x \ --without-zlib -MAKE_FLAGS+= CC='${TARGET_CC}' LD='${TARGET_LD}' +MAKE_FLAGS+= CC='${TARGET_CC}' do-install: ${INSTALL_DIR} ${IDIR_ELINKS}/usr/bin diff --git a/package/elinks/patches/patch-Makefile_lib b/package/elinks/patches/patch-Makefile_lib new file mode 100644 index 000000000..122e6c13d --- /dev/null +++ b/package/elinks/patches/patch-Makefile_lib @@ -0,0 +1,11 @@ +--- elinks-0.11.7.orig/Makefile.lib 2009-08-22 13:15:08.000000000 +0200 ++++ elinks-0.11.7/Makefile.lib 2010-03-06 11:28:58.000000000 +0100 +@@ -43,7 +43,7 @@ quiet_cmd_compile = ' [$(CC_COLOR)C + + # Rule to compile a set of .o files into one .o file + quiet_cmd_ld_objs = " [$(LD_COLOR)LD$(END_COLOR)] $(RELPATH)$@" +- cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \ ++ cmd_ld_objs = $(CC) -Wl,-r -nostdlib -o $@ $(filter $(OBJS), $^) \ + $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \ + `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`) + |