summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-13 10:10:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-13 10:10:13 +0100
commit059dad2460c0daa3c8ca2f945539b9c957540633 (patch)
tree02f3173ee6e0c1068222b5e5fc7eb4efffd57bd1 /package
parent2a5b7c0036d7bfef6fe9e2a49e34392282831c15 (diff)
parent01c284ff8d0220f6c4c217415380f8e42fb3c71c (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/dosfstools/Makefile5
-rw-r--r--package/dosfstools/patches/patch-Makefile10
-rw-r--r--package/lighttpd/Makefile4
3 files changed, 11 insertions, 8 deletions
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index 2235e73af..1dd82182a 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= dosfstools
PKG_VERSION:= 3.0.26
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 45012f5f56f2aae3afcd62120b9e5a08
PKG_DESCR:= utilities to create and check FAT filesystems
PKG_SECTION:= fs
+PKG_BUILDDEP:= libiconv-tiny
PKG_URL:= http://www.daniel-baumann.ch/software/dosfstools/
PKG_SITES:= http://daniel-baumann.ch/files/software/dosfstools/
@@ -19,7 +20,7 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-XAKE_FLAGS+= PREFIX="" OPTFLAGS="-D_FILE_OFFSET_BITS=64"
+XAKE_FLAGS+= PREFIX=""
dosfstools-install:
${INSTALL_DIR} ${IDIR_DOSFSTOOLS}/sbin
diff --git a/package/dosfstools/patches/patch-Makefile b/package/dosfstools/patches/patch-Makefile
index c20b7f4dc..1d127acbc 100644
--- a/package/dosfstools/patches/patch-Makefile
+++ b/package/dosfstools/patches/patch-Makefile
@@ -1,11 +1,13 @@
---- dosfstools-3.0.9.orig/Makefile 2009-10-04 11:03:23.000000000 +0200
-+++ dosfstools-3.0.9/Makefile 2011-01-07 21:50:15.000000000 +0100
-@@ -29,7 +29,7 @@ OPTFLAGS = -O2 -fomit-frame-pointer $(sh
+--- dosfstools-3.0.26.orig/Makefile 2014-01-17 07:09:28.000000000 +0100
++++ dosfstools-3.0.26/Makefile 2014-03-13 08:58:52.000000000 +0100
+@@ -32,7 +32,9 @@ OPTFLAGS = -O2 -fomit-frame-pointer -D_G
#WARNFLAGS = -Wall -pedantic -std=c99
- WARNFLAGS = -Wall
+ WARNFLAGS = -Wall -Wextra -Wno-sign-compare -Wno-missing-field-initializers -Wmissing-prototypes -Wstrict-prototypes
DEBUGFLAGS = -g
-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
++CFLAGS ?=
+CFLAGS += $(WARNFLAGS)
++LDLIBS = -liconv
VPATH = src
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 0abbe5999..4a0c8807e 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= lighttpd
-PKG_VERSION:= 1.4.33
+PKG_VERSION:= 1.4.35
PKG_RELEASE:= 1
-PKG_MD5SUM:= 16e7c85a11a660213be4f83a9a1b752d
+PKG_MD5SUM:= 69057685df672218d45809539b874917
PKG_DESCR:= a lightweight web server
PKG_SECTION:= www
PKG_DEPENDS:= libgcc