diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:49:34 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:49:34 +0200 |
commit | 8a2754e0fbdea7497281327f2896be2a1253a107 (patch) | |
tree | bc7c400745fde54e6fb7a010fcb026258564d3bc /package/digitemp | |
parent | 9bd4456c5a83c3474fdf9fe5cf14004a0874e2c8 (diff) | |
parent | 2d3aaf1664850031f5497e121dc82ab65f63641a (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
Diffstat (limited to 'package/digitemp')
-rw-r--r-- | package/digitemp/Makefile | 9 | ||||
-rw-r--r-- | package/digitemp/patches/001-Makefile.patch | 29 | ||||
-rw-r--r-- | package/digitemp/patches/patch-Makefile | 14 |
3 files changed, 18 insertions, 34 deletions
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile index ea99684be..13cc6bedc 100644 --- a/package/digitemp/Makefile +++ b/package/digitemp/Makefile @@ -1,16 +1,14 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. include ${TOPDIR}/rules.mk PKG_NAME:= digitemp -PKG_VERSION:= 3.3.2 +PKG_VERSION:= 3.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 0b6cfb36d198767836de54d9fb11bbdb +PKG_MD5SUM:= 9be2e48db37920f21925ae6e88f83b84 PKG_DESCR:= simple to use program for reading values from 1-wire devices -PKG_SECTION:= app +PKG_SECTION:= misc PKG_DEPENDS:= libusb PKG_URL:= http://www.digitemp.com/software/linux PKG_SITES:= http://www.digitemp.com/software/linux/ @@ -19,6 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TCFLAGS+= -I./src -I./userial ALL_TARGET= ds2490 BUILD_STYLE= auto diff --git a/package/digitemp/patches/001-Makefile.patch b/package/digitemp/patches/001-Makefile.patch deleted file mode 100644 index a08164b86..000000000 --- a/package/digitemp/patches/001-Makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- digitemp-3.3.2.orig/Makefile 2004-02-04 15:17:10.000000000 +0100 -+++ digitemp-3.3.2/Makefile 2006-08-16 20:17:27.000000000 +0200 -@@ -15,8 +15,6 @@ - - VERSION = 3.3.2 - -- --CC = gcc - CFLAGS = -I./src -I./userial -O2 # -g -Wall - LIBS = -lm - -@@ -57,7 +55,7 @@ - CFLAGS += -DLINUX - - # Set LOCK to yes for serial port locking support -- LOCK = yes -+ #LOCK = yes - - endif - -@@ -123,7 +121,7 @@ - $(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097UOBJS) -o digitemp_DS9097U $(LIBS) - - ds2490: $(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS2490OBJS) -- $(CC) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS) -+ $(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS2490OBJS) -o digitemp_DS2490 $(LIBS) - - - # Clean up the object files and the sub-directory for distributions diff --git a/package/digitemp/patches/patch-Makefile b/package/digitemp/patches/patch-Makefile new file mode 100644 index 000000000..10ac0c97f --- /dev/null +++ b/package/digitemp/patches/patch-Makefile @@ -0,0 +1,14 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- digitemp-3.6.0.orig/Makefile 2008-08-28 23:37:00.000000000 +0200 ++++ digitemp-3.6.0/Makefile 2009-06-01 20:04:20.000000000 +0200 +@@ -11,8 +11,8 @@ + + VERSION = 3.6.0 + +-CC = gcc +-CFLAGS = -I./src -I./userial -O2 -Wall # -g ++CC ?= gcc ++CFLAGS ?= -I./src -I./userial + + OBJS = src/digitemp.o src/device_name.o src/ds2438.o + HDRS = src/digitemp.h src/device_name.h |