diff options
Diffstat (limited to 'package/digitemp/patches')
| -rw-r--r-- | package/digitemp/patches/patch-Makefile | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/package/digitemp/patches/patch-Makefile b/package/digitemp/patches/patch-Makefile index 4f19aaae2..95b89e7b3 100644 --- a/package/digitemp/patches/patch-Makefile +++ b/package/digitemp/patches/patch-Makefile @@ -1,7 +1,7 @@ do not use static linking on Cygwin --- digitemp-3.6.0.orig/Makefile 2008-08-28 23:37:00.000000000 +0200 -+++ digitemp-3.6.0/Makefile 2010-01-06 19:12:56.868375000 +0100 -@@ -11,8 +11,8 @@ ++++ digitemp-3.6.0/Makefile 2011-01-14 21:37:33.000000000 +0100 +@@ -11,8 +11,9 @@ VERSION = 3.6.0 @@ -9,10 +9,20 @@ do not use static linking on Cygwin -CFLAGS = -I./src -I./userial -O2 -Wall # -g +CC ?= gcc +CFLAGS ?= -I./src -I./userial ++LDFLAGS ?= OBJS = src/digitemp.o src/device_name.o src/ds2438.o HDRS = src/digitemp.h src/device_name.h -@@ -57,7 +57,6 @@ endif +@@ -45,7 +46,7 @@ DS2490OBJS = userial/ds2490/ownet.o user + # If you add a new OSTYPE here please email it to me so that I can add + # it to the distribution in the next release + # ----------------------------------------------------------------------- +-SYSTYPE := $(shell uname -s) ++SYSTYPE := Linux + + ifeq ($(SYSTYPE), Linux) + CFLAGS += -DLINUX +@@ -57,7 +58,6 @@ endif ifneq (, $(findstring CYGWIN,$(SYSTYPE))) CFLAGS += -DCYGWIN @@ -20,3 +30,20 @@ do not use static linking on Cygwin endif ifeq ($(SYSTYPE), SunOS) +@@ -116,13 +116,13 @@ all: help + + # Build the Linux executable + ds9097: $(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS9097OBJS) +- $(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097OBJS) -o digitemp_DS9097 $(LIBS) ++ $(CC) $(LDFLAGS) $(OBJS) $(ONEWIREOBJS) $(DS9097OBJS) -o digitemp_DS9097 $(LIBS) + + ds9097u: $(OBJS) $(HDRS) $(ONEWIREOBJS) $(ONEWIREHDRS) $(DS9097UOBJS) +- $(CC) $(OBJS) $(ONEWIREOBJS) $(DS9097UOBJS) -o digitemp_DS9097U $(LIBS) ++ $(CC) $(LDFLAGS) $(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 |