Attachment #203157 for bug #236799

View | Details | Raw Unified | Return to bug 236799
Collapse All | Expand All

Lines 20-26 Link Here

(-)Makefile (-1 / +1 lines)
20		20
21	CONFLICTS= pwsafe-[0-9]*	21	CONFLICTS= pwsafe-[0-9]*
22		22
23	USES= gmake	23	USES= compiler:c++11-lang gmake
24	USE_GITHUB= yes	24	USE_GITHUB= yes
25	USE_WX= 3.0+	25	USE_WX= 3.0+
26	USE_XORG= x11 xtst	26	USE_XORG= x11 xtst




--- Makefile.freebsd.orig	2017-10-07 17:53:15 UTC
+++ Makefile.freebsd
@@ -34,8 +34,6 @@ GIT := git
 GZIP := gzip

 GPG := /usr/local/bin/gpg
 GPG_SIGN := $(GPG) --detach-sign --default-key $(GPG_KEY)
 SIGN_CMD := $(foreach file, $(wildcard $(RELEASEDIR)/*$(RELEASENAME)*), $(GPG_SIGN) $(file); )
@@ -46,11 +44,8 @@ SF_UPLOAD_DST := $(SF_UPLOAD_ROOT)/Linux-BETA/$(RELEAS
 RELTAG = wx$(subst .,_,$(RELEASENAME))
 
 export CPPFLAGS += -std=c++11
-export CXXFLAGS += --stdlib=libc++ -I/usr/local/include
+export CXXFLAGS += -I/usr/local/include
 export CFLAGS += -I/usr/local/include
-export CC = clang
-export CXX = clang++
-export CPP = clang++
 export PLATFORM = FreeBSD
 
 all: I18N unicodedebug unicoderelease

Line 0 Link Here

(-)files/patch-src_core_PwsPlatform.h (+11 lines)
	1	--- src/core/PwsPlatform.h.orig 2019-03-26 09:46:50 UTC
	2	+++ src/core/PwsPlatform.h
	3	@@ -140,6 +140,8 @@
	4	#define LTC_NO_ROLC
	5	#if defined(__i386__) \|\| defined(__amd64__)
	6	#define PWS_LITTLE_ENDIAN
	7	+#elif defined(__ppc__)
	8	+#define PWS_BIG_ENDIAN
	9	#endif
	10	// **********************************************
	11	// * Add other platforms here... *

Return to bug 236799

Lines 1-4 Link Here

(-)files/patch-Makefile.freebsd (-1 / +14 lines)
1	--- Makefile.freebsd.orig 2017-05-01 15:10:07 UTC	1	--- Makefile.freebsd.orig 2017-10-07 17:53:15 UTC
2	+++ Makefile.freebsd	2	+++ Makefile.freebsd
3	@@ -34,8 +34,6 @@ GIT := git	3	@@ -34,8 +34,6 @@ GIT := git
4	GZIP := gzip	4	GZIP := gzip
Lines 9-11 Link Here
9	GPG := /usr/local/bin/gpg	9	GPG := /usr/local/bin/gpg
10	GPG_SIGN := $(GPG) --detach-sign --default-key $(GPG_KEY)	10	GPG_SIGN := $(GPG) --detach-sign --default-key $(GPG_KEY)
11	SIGN_CMD := $(foreach file, $(wildcard $(RELEASEDIR)/$(RELEASENAME)), $(GPG_SIGN) $(file); )	11	SIGN_CMD := $(foreach file, $(wildcard $(RELEASEDIR)/$(RELEASENAME)), $(GPG_SIGN) $(file); )
		12	@@ -46,11 +44,8 @@ SF_UPLOAD_DST := $(SF_UPLOAD_ROOT)/Linux-BETA/$(RELEAS
		13	RELTAG = wx$(subst .,_,$(RELEASENAME))
		14
		15	export CPPFLAGS += -std=c++11
		16	-export CXXFLAGS += --stdlib=libc++ -I/usr/local/include
		17	+export CXXFLAGS += -I/usr/local/include
		18	export CFLAGS += -I/usr/local/include
		19	-export CC = clang
		20	-export CXX = clang++
		21	-export CPP = clang++
		22	export PLATFORM = FreeBSD
		23
		24	all: I18N unicodedebug unicoderelease