Attachment #237164 for bug #266917

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

Lines 1-5 Link Here

(-)b/cad/abc/Makefile (-2 / +2 lines)
1	PORTNAME= abc	1	PORTNAME= abc
2	DISTVERSION= g20200322	2	DISTVERSION= g20220920
3	CATEGORIES= cad	3	CATEGORIES= cad
4		4
5	MAINTAINER= uddka@student.kit.edu	5	MAINTAINER= uddka@student.kit.edu
Lines 14-20 BUILD_DEPENDS= gmake:devel/gmake Link Here
14	USES= cmake	14	USES= cmake
15	USE_GITHUB= yes	15	USE_GITHUB= yes
16	GH_ACCOUNT= berkeley-abc	16	GH_ACCOUNT= berkeley-abc
17	GH_TAGNAME= a4518e6f833885c905964f1233d11e5b941ec24c	17	GH_TAGNAME= 5fb4912559380dfcb55e76c23d3fa69c0da454f8
18	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
19		19
20	BINARY_ALIAS= make=${GMAKE}	20	BINARY_ALIAS= make=${GMAKE}

Lines 1-3 Link Here

(-)b/cad/abc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1584862926	1	TIMESTAMP = 1665323497
2	SHA256 (berkeley-abc-abc-g20200322-a4518e6f833885c905964f1233d11e5b941ec24c_GH0.tar.gz) = 66d928e01a8652d634cdc8d113ccfb5f79e3160be5fe49da0697845d31754760	2	SHA256 (berkeley-abc-abc-g20220920-5fb4912559380dfcb55e76c23d3fa69c0da454f8_GH0.tar.gz) = 219e6c88cb5129e7bac181feb5f9b92fb715c3c55a4eaa7715c30a53b7867985
3	SIZE (berkeley-abc-abc-g20200322-a4518e6f833885c905964f1233d11e5b941ec24c_GH0.tar.gz) = 5760207	3	SIZE (berkeley-abc-abc-g20220920-5fb4912559380dfcb55e76c23d3fa69c0da454f8_GH0.tar.gz) = 6065799

Lines 1-6 Link Here

(-)b/cad/abc/files/patch-CMakeLists.txt (-3 / +3 lines)
1	--- CMakeLists.txt.orig 2020-03-22 08:33:14 UTC	1	--- CMakeLists.txt.orig 2022-09-20 01:47:58 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -91,7 +91,7 @@ endfunction()	3	@@ -96,7 +96,7 @@ list(REMOVE_ITEM ABC_SRC ${ABC_MAIN_SRC})
4	set(ABC_MAIN_SRC src/base/main/main.c)	4	set(ABC_MAIN_SRC src/base/main/main.c)
5	list(REMOVE_ITEM ABC_SRC ${ABC_MAIN_SRC})	5	list(REMOVE_ITEM ABC_SRC ${ABC_MAIN_SRC})
6		6
Lines 9-15 Link Here
9	abc_properties(libabc PUBLIC)	9	abc_properties(libabc PUBLIC)
10	set_property(TARGET libabc PROPERTY OUTPUT_NAME abc)	10	set_property(TARGET libabc PROPERTY OUTPUT_NAME abc)
11		11
12	@@ -99,7 +99,7 @@ add_executable(abc ${ABC_MAIN_SRC})	12	@@ -104,7 +104,7 @@ abc_properties(abc PRIVATE)
13	target_link_libraries(abc PRIVATE libabc)	13	target_link_libraries(abc PRIVATE libabc)
14	abc_properties(abc PRIVATE)	14	abc_properties(abc PRIVATE)
15		15




--- Makefile.orig	2022-10-09 13:52:58 UTC
+++ Makefile
@@ -1,6 +1,4 @@
 
-CC   := gcc
-CXX  := g++
 AR   := ar
 LD   := $(CXX)
 
@@ -53,8 +51,6 @@ ARCHFLAGS := $(ARCHFLAGS)
 endif
 
 ARCHFLAGS := $(ARCHFLAGS)
 
-OPTFLAGS  ?= -g -O
-
-OPTFLAGS  ?= -g -O
 
 CFLAGS    += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(ARCHFLAGS)
 ifneq ($(findstring arm,$(shell uname -m)),)
 	CFLAGS += -DABC_MEMALIGN=4
- 

Return to bug 266917

Lines 1-18 Link Here

(-)b/cad/abc/files/patch-Makefile (-7 / +6 lines)
1	--- Makefile.orig 2018-03-30 08:04:05 UTC	1	--- Makefile.orig 2022-10-09 13:52:58 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,6 +1,4 @@	3	@@ -1,6 +1,4 @@
4		4
5	-CC := gcc	5	-CC := gcc
6	-CXX := g++	6	-CXX := g++
		7	AR := ar
7	LD := $(CXX)	8	LD := $(CXX)
8		9
9	MSG_PREFIX ?=	10	@@ -53,8 +51,6 @@ ARCHFLAGS := $(ARCHFLAGS)
10	@@ -52,8 +50,6 @@ endif	11	endif
11		12
12	ARCHFLAGS := $(ARCHFLAGS)	13	ARCHFLAGS := $(ARCHFLAGS)
13
14	-OPTFLAGS ?= -g -O
15	-	14	-
		15	-OPTFLAGS ?= -g -O
		16
16	CFLAGS += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(ARCHFLAGS)	17	CFLAGS += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(ARCHFLAGS)
17	ifneq ($(findstring arm,$(shell uname -m)),)	18	ifneq ($(findstring arm,$(shell uname -m)),)
18	CFLAGS += -DABC_MEMALIGN=4
19	-