fed up of this shit hanging during bulk builds once every two builds
(race condition). I suspect running configure from the Makefile and grepping the results is not very stable, so since we have WRKCONF, run configure from the configure stage and be done with that shit.
This commit is contained in:
parent
0ca949efa8
commit
3aa614af73
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2005/03/10 06:25:38 sturm Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2005/05/04 08:49:36 espie Exp $
|
||||
|
||||
COMMENT= "Soundscope for GkrellM2 using ESD"
|
||||
|
||||
@ -15,6 +15,8 @@ LIB_DEPENDS+= esd::audio/esound \
|
||||
CFLAGS+= -DHAVE_FFTW2
|
||||
|
||||
PLUGIN= ${WRKSRC}/src/gkrellmss.so
|
||||
CONFIGURE_STYLE= gnu
|
||||
WRKCONF=${WRKSRC}/src
|
||||
|
||||
EXTRA_WANTLIB= audiofile
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_Makefile,v 1.2 2004/05/18 14:49:56 naddy Exp $
|
||||
--- src/Makefile.orig 2004-05-17 23:23:43.000000000 -0500
|
||||
+++ src/Makefile 2004-05-17 23:25:13.000000000 -0500
|
||||
$OpenBSD: patch-src_Makefile,v 1.3 2005/05/04 08:49:36 espie Exp $
|
||||
--- src/Makefile.orig Fri Feb 20 20:40:10 2004
|
||||
+++ src/Makefile Wed May 4 10:47:35 2005
|
||||
@@ -8,8 +8,8 @@ INSTALLDIR ?= $(INSTALLROOT)/lib/gkrellm
|
||||
INSTALL ?= install
|
||||
|
||||
@ -12,7 +12,22 @@ $OpenBSD: patch-src_Makefile,v 1.2 2004/05/18 14:49:56 naddy Exp $
|
||||
|
||||
OS_NAME=$(shell uname -s)
|
||||
|
||||
@@ -66,15 +66,15 @@ ifeq ($(HAVE_ESOUND),1)
|
||||
@@ -17,14 +17,6 @@ SD_INCLUDE ?=
|
||||
SD_LIB ?=
|
||||
|
||||
|
||||
-ifeq ($(without-alsa),yes)
|
||||
- CONFIGURE_ARGS += --without-alsa
|
||||
-endif
|
||||
-ifeq ($(without-esd),yes)
|
||||
- CONFIGURE_ARGS += --without-esd
|
||||
-endif
|
||||
-
|
||||
-DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
|
||||
HAVE_FFTW3 = $(shell grep -c HAVE_FFTW3 configure.h)
|
||||
HAVE_FFTW2 = $(shell grep -c HAVE_FFTW2 configure.h)
|
||||
HAVE_ALSA = $(shell grep -c HAVE_ALSA configure.h)
|
||||
@@ -66,15 +58,15 @@ ifeq ($(HAVE_ESOUND),1)
|
||||
endif
|
||||
|
||||
|
||||
@ -31,7 +46,7 @@ $OpenBSD: patch-src_Makefile,v 1.2 2004/05/18 14:49:56 naddy Exp $
|
||||
STRIP ?= -s
|
||||
endif
|
||||
|
||||
@@ -90,8 +90,7 @@ ifeq ($(alsa),1)
|
||||
@@ -90,8 +82,7 @@ ifeq ($(alsa),1)
|
||||
FLAGS += -DGKRELLM_ALSA
|
||||
endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user