diff options
author | agc <agc@pkgsrc.org> | 2014-12-02 21:49:23 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2014-12-02 21:49:23 +0000 |
commit | 1b03affd61d3499069bc06937d5ff90383a623c4 (patch) | |
tree | 6a4f74f22e919fe0012f9f575f9e1337ee9d0478 /devel/mad-flute | |
parent | c3d52f066f96b0df1e176a622177a98b17fcf285 (diff) | |
download | pkgsrc-1b03affd61d3499069bc06937d5ff90383a623c4.tar.gz |
Request from joerg to link with the correct lib paths
Diffstat (limited to 'devel/mad-flute')
-rw-r--r-- | devel/mad-flute/distinfo | 4 | ||||
-rw-r--r-- | devel/mad-flute/patches/patch-flute__Makefile | 67 | ||||
-rw-r--r-- | devel/mad-flute/patches/patch-multis_flute__Makefile | 62 |
3 files changed, 132 insertions, 1 deletions
diff --git a/devel/mad-flute/distinfo b/devel/mad-flute/distinfo index 734575a9c72..833e1710d0f 100644 --- a/devel/mad-flute/distinfo +++ b/devel/mad-flute/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2012/05/02 04:43:11 agc Exp $ +$NetBSD: distinfo,v 1.2 2014/12/02 21:49:23 agc Exp $ SHA1 (mad_fcl_v1.7_src.tar.gz) = e2157b42e1006167224fbaea7bec46d438e6a41c RMD160 (mad_fcl_v1.7_src.tar.gz) = 6aeaf046f16818fc591702371feeab11c02d4ce7 @@ -16,3 +16,5 @@ SHA1 (patch-aj) = ba74bc1ab51c19449953c5a4e4837223d3859054 SHA1 (patch-ak) = 845bcf4cad65fbb73b8ad847f7fccbd385858a16 SHA1 (patch-al) = 757ff7f015b9b60edae79d1372227553621590f3 SHA1 (patch-am) = 198d7ec12fcbe1328408d8928d13710cb380dff2 +SHA1 (patch-flute__Makefile) = fc42130de7639386de75f41063d72577c47ec8f6 +SHA1 (patch-multis_flute__Makefile) = b872a7ece7681da7638594e65a809f25a9f5511c diff --git a/devel/mad-flute/patches/patch-flute__Makefile b/devel/mad-flute/patches/patch-flute__Makefile new file mode 100644 index 00000000000..43c2f119e48 --- /dev/null +++ b/devel/mad-flute/patches/patch-flute__Makefile @@ -0,0 +1,67 @@ +$NetBSD: patch-flute__Makefile,v 1.1 2014/12/02 21:49:23 agc Exp $ + +Request from joerg to link with the right lib path + +--- flute/Makefile 2014/12/02 21:39:38 1.1 ++++ flute/Makefile 2014/12/02 21:40:35 +@@ -1,29 +1,31 @@ +-CC = gcc
+-#CC = ccmalloc g++
+-
+-CFLAGS += -Wall -O3 -g -DLINUX -D_LARGE_FILE_API -D_LARGEFILE64_SOURCE -D_ISOC99_SOURCE -D_XOPEN_SOURCE=500 \
+- -I../flutelib \
+- -I/usr/local/ssl/include \
+- -I/usr/include
+-
+-LFLAGS += -L../lib -lflutelib -lalc -lsdp \
+- -lexpat -lpthread -lm -lz -lcurl \
+- -L/usr/local/ssl/lib -lcrypto
+-
+-SOURCES = main.c
+-
+-OBJECTS = $(SOURCES:%.c=%.o)
+-
+-%.o: %.c
+- $(CC) -c $(CFLAGS) -o $@ $<
+-
+-all: flute
+-
+-flute: $(OBJECTS)
+- $(CC) -o ../bin/flute $(OBJECTS) $(LFLAGS)
+-
+-clean:
+- rm -f ../bin/flute *.o *~
+-
+-main.c: ../flutelib/flute.h ../flutelib/http_file_repair.h \
+- ../flutelib/flute_file_repair.h ../flutelib/apd.h
++CC = gcc ++#CC = ccmalloc g++ ++ ++CFLAGS += -Wall -O3 -g -DLINUX -D_LARGE_FILE_API -D_LARGEFILE64_SOURCE -D_ISOC99_SOURCE -D_XOPEN_SOURCE=500 \ ++ -I../flutelib \ ++ -I/usr/local/ssl/include \ ++ -I/usr/include ++ ++LFLAGS += -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib \ ++ -L../lib -Wl,-rpath,../lib \ ++ -lflutelib -lalc -lsdp \ ++ -lexpat -lpthread -lm -lz -lcurl \ ++ -L/usr/local/ssl/lib -lcrypto ++ ++SOURCES = main.c ++ ++OBJECTS = $(SOURCES:%.c=%.o) ++ ++%.o: %.c ++ $(CC) -c $(CFLAGS) -o $@ $< ++ ++all: flute ++ ++flute: $(OBJECTS) ++ $(CC) -o ../bin/flute $(OBJECTS) $(LFLAGS) ++ ++clean: ++ rm -f ../bin/flute *.o *~ ++ ++main.c: ../flutelib/flute.h ../flutelib/http_file_repair.h \ ++ ../flutelib/flute_file_repair.h ../flutelib/apd.h diff --git a/devel/mad-flute/patches/patch-multis_flute__Makefile b/devel/mad-flute/patches/patch-multis_flute__Makefile new file mode 100644 index 00000000000..a27e29e714b --- /dev/null +++ b/devel/mad-flute/patches/patch-multis_flute__Makefile @@ -0,0 +1,62 @@ +$NetBSD: patch-multis_flute__Makefile,v 1.1 2014/12/02 21:49:23 agc Exp $ + +Request from joerg to link with the correct lib paths + +--- multis_flute/Makefile 2014/12/02 21:45:23 1.1 ++++ multis_flute/Makefile 2014/12/02 21:46:44 +@@ -1,27 +1,28 @@ +-CC = gcc
+-
+-CFLAGS += -Wall -O3 -g -DLINUX -D_LARGE_FILE_API -D_LARGEFILE64_SOURCE -D_ISOC99_SOURCE -D_XOPEN_SOURCE=500 \
+- -I../flutelib \
+- -I/usr/local/ssl/include
+-
+-LFLAGS += -L../lib -lflutelib -lalc -lsdp \
+- -lexpat -lpthread -lm -lz -lcurl \
+- -L/usr/local/ssl/lib/ -lcrypto
+-
+-SOURCES = main.c
+-
+-OBJECTS = $(SOURCES:%.c=%.o)
+-
+-%.o: %.c
+- $(CC) -c $(CFLAGS) -o $@ $<
+-
+-all: multis_flute
+-
+-multis_flute: $(OBJECTS)
+- $(CC) -o ../bin/multis_flute $(OBJECTS) $(LFLAGS)
+-
+-clean:
+- rm -f ../bin/multis_flute *.o *~
+-
+-main.c: ../flutelib/flute.h ../flutelib/http_file_repair.h \
+- ../flutelib/flute_file_repair.h ../flutelib/apd.h
++CC = gcc ++ ++CFLAGS += -Wall -O3 -g -DLINUX -D_LARGE_FILE_API -D_LARGEFILE64_SOURCE -D_ISOC99_SOURCE -D_XOPEN_SOURCE=500 \ ++ -I../flutelib \ ++ -I/usr/local/ssl/include ++ ++LFLAGS += -L../lib -Wl,-rpath,../lib -lflutelib -lalc -lsdp \ ++ -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib \ ++ -lexpat -lpthread -lm -lz -lcurl \ ++ -L/usr/local/ssl/lib/ -lcrypto ++ ++SOURCES = main.c ++ ++OBJECTS = $(SOURCES:%.c=%.o) ++ ++%.o: %.c ++ $(CC) -c $(CFLAGS) -o $@ $< ++ ++all: multis_flute ++ ++multis_flute: $(OBJECTS) ++ $(CC) -o ../bin/multis_flute $(OBJECTS) $(LFLAGS) ++ ++clean: ++ rm -f ../bin/multis_flute *.o *~ ++ ++main.c: ../flutelib/flute.h ../flutelib/http_file_repair.h \ ++ ../flutelib/flute_file_repair.h ../flutelib/apd.h |