4def81e7f7
HAVE_SCHED_YIELD should be set since we have sched_yield(). The sched_yield.h compatibility wrapper then does not try to create a fallback macro which conflicts with the prototype of the syscall wrapper.
60 lines
1.8 KiB
Plaintext
60 lines
1.8 KiB
Plaintext
$OpenBSD: patch-Makefile_defs,v 1.2 2012/06/12 23:39:09 sthen Exp $
|
|
--- Makefile.defs.orig Thu Apr 19 15:10:24 2012
|
|
+++ Makefile.defs Tue Jun 12 23:10:37 2012
|
|
@@ -422,7 +422,7 @@ endif
|
|
endif
|
|
|
|
# dirs
|
|
-cfg_dir = etc/$(MAIN_NAME)/
|
|
+cfg_dir = share/examples/$(MAIN_NAME)/
|
|
bin_dir = sbin/
|
|
share_dir = share/$(MAIN_NAME)/
|
|
# lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s, lib/$(MAIN_NAME)/modules-k
|
|
@@ -504,7 +504,7 @@ data_prefix = $(basedir)$(prefix)
|
|
|
|
|
|
# target dirs for various stuff
|
|
-cfg_target = $(prefix)/$(cfg_dir)
|
|
+cfg_target = $(SYSCONFDIR)/$(MAIN_NAME)/
|
|
bin_target = $(prefix)/$(bin_dir)
|
|
#modules_target = $(prefix)/$(modules_dir)
|
|
lib_target = $(prefix)/$(lib_dir)
|
|
@@ -940,7 +940,7 @@ ifeq ($(ARCH), x86_64)
|
|
ifeq ($(CC_NAME), gcc)
|
|
C_DEFS+=-DCC_GCC_LIKE_ASM
|
|
#common stuff
|
|
- CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE)
|
|
+ CFLAGS=
|
|
#if gcc 4.5+
|
|
# don't add '-mtune=$(CPU)' - gcc failure
|
|
ifeq ($(CC_SHORTVER), 4.5+)
|
|
@@ -954,12 +954,8 @@ else
|
|
#if gcc 4.2+
|
|
ifeq ($(CC_SHORTVER), 4.2+)
|
|
$(call set_if_empty,CPU,opteron)
|
|
- CFLAGS+=-m64 -minline-all-stringops \
|
|
- -falign-loops \
|
|
- -ftree-vectorize \
|
|
- -fno-strict-overflow \
|
|
- -mtune=$(CPU)
|
|
- LDFLAGS+=-m64
|
|
+ CFLAGS+=
|
|
+ LDFLAGS+=
|
|
else
|
|
#if gcc 4.0+
|
|
ifeq ($(CC_SHORTVER), 4.x)
|
|
@@ -1899,9 +1895,10 @@ endif
|
|
|
|
ifeq ($(OS), openbsd)
|
|
C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \
|
|
- -DHAVE_UNION_SEMUN -DHAVE_MSGHDR_MSG_CONTROL \
|
|
- -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \
|
|
- -DHAVE_NETINET_IN_SYSTM -DUSE_SIGWAIT
|
|
+ -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \
|
|
+ -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_CONNECT_ECONNRESET_BUG \
|
|
+ -DHAVE_TIMEGM -DHAVE_NETINET_IN_SYSTM \
|
|
+ -DUSE_SIGWAIT
|
|
ifneq ($(found_lock_method), yes)
|
|
C_DEFS+= -DUSE_PTHREAD_MUTEX # try pthread sems
|
|
found_lock_method=yes
|