diff options
Diffstat (limited to 'package/elinks')
-rw-r--r-- | package/elinks/Config.in | 9 | ||||
-rw-r--r-- | package/elinks/Makefile | 12 | ||||
-rw-r--r-- | package/elinks/patches/patch-Makefile_lib | 12 |
3 files changed, 10 insertions, 23 deletions
diff --git a/package/elinks/Config.in b/package/elinks/Config.in deleted file mode 100644 index d44e69e8f..000000000 --- a/package/elinks/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config ADK_PACKAGE_ELINKS - prompt "elinks............................ A text based web browser" - tristate - default n - select ADK_PACKAGE_LIBOPENSSL - help - An advanced text based web browser - - http://elinks.or.cz/ diff --git a/package/elinks/Makefile b/package/elinks/Makefile index eba50742f..a555a5db6 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -5,19 +5,22 @@ include ${TOPDIR}/rules.mk PKG_NAME:= elinks PKG_VERSION:= 0.11.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 3 PKG_MD5SUM:= 145c510cae41c204d0f23dce4bdd23ab PKG_DESCR:= advanced text web browser PKG_SECTION:= text PKG_DEPENDS:= libopenssl -PKG_URL:= http://elinks.or.cz +PKG_BUILDDEP+= openssl +PKG_URL:= http://elinks.or.cz/ PKG_SITES:= http://elinks.or.cz/download/ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu +INSTALL_STYLE:= manual + +TCFLAGS+= -fPIC CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes CONFIGURE_ENV+= $(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes CONFIGURE_ARGS+= --enable-small \ @@ -41,8 +44,7 @@ CONFIGURE_ARGS+= --enable-small \ --without-spidermonkey \ --without-x \ --without-zlib -BUILD_STYLE:= auto -MAKE_FLAGS+= V=1 CC='${TARGET_CC}' LD='${TARGET_CC}' +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 index 28b35fc6f..122e6c13d 100644 --- a/package/elinks/patches/patch-Makefile_lib +++ b/package/elinks/patches/patch-Makefile_lib @@ -1,17 +1,11 @@ --- elinks-0.11.7.orig/Makefile.lib 2009-08-22 13:15:08.000000000 +0200 -+++ elinks-0.11.7/Makefile.lib 2009-08-28 12:26:30.526558172 +0200 -@@ -43,12 +43,12 @@ quiet_cmd_compile = ' [$(CC_COLOR)C ++++ 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 = $(LD) -shared -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)`) - quiet_cmd_link = ' [$(LINK_COLOR)LINK$(END_COLOR)] $(RELPATH)$@' -- cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -+ cmd_link = $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - - quiet_cmd_sparse = ' [SPARSE] $(RELPATH)$(2)' - cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2) |