git: 7d6a28c45fdc - main - devel/pickle: Switch to llvm15
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 May 2026 21:53:34 UTC
The branch main has been updated by bofh:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7d6a28c45fdc55f1811d136dcb73be10f51918c0
commit 7d6a28c45fdc55f1811d136dcb73be10f51918c0
Author: Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2026-05-15 10:38:33 +0000
Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2026-05-15 21:53:13 +0000
devel/pickle: Switch to llvm15
---
devel/pickle/Makefile | 9 ++-
devel/pickle/files/patch-src_io.c | 27 +++++++
devel/pickle/files/patch-src_io.h | 15 ++++
devel/pickle/files/patch-src_pic14.c | 142 ++++++++++++++++++++++++++++++++++
devel/pickle/files/patch-src_pic14n.c | 83 ++++++++++++++++++++
devel/pickle/files/patch-src_pic16n.c | 92 ++++++++++++++++++++++
6 files changed, 365 insertions(+), 3 deletions(-)
diff --git a/devel/pickle/Makefile b/devel/pickle/Makefile
index 350056fbce0d..636209f7cac6 100644
--- a/devel/pickle/Makefile
+++ b/devel/pickle/Makefile
@@ -1,5 +1,6 @@
PORTNAME= pickle
DISTVERSION= 5.01
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= LOCAL/bofh/devel/${PORTNAME}
@@ -17,6 +18,10 @@ USES= gmake tar:tgz
ALL_TARGET= freebsd
+CFLAGS+= -Wno-gnu-line-marker
+
+WRKSRC= ${WRKDIR}/${PORTNAME}
+
PLIST_FILES= ${BIN_SYMLINKS} \
bin/${PORTNAME}
@@ -26,12 +31,10 @@ BIN_SYMLINKS= bin/n14 \
bin/p14 \
bin/p16
-WRKSRC= ${WRKDIR}/${PORTNAME}
-
.include <bsd.port.options.mk>
.if ${OPSYS} == FreeBSD
-USES+= llvm:max=14
+USES+= llvm:max=15
.endif
post-patch:
diff --git a/devel/pickle/files/patch-src_io.c b/devel/pickle/files/patch-src_io.c
new file mode 100644
index 000000000000..4f820c1c73fe
--- /dev/null
+++ b/devel/pickle/files/patch-src_io.c
@@ -0,0 +1,27 @@
+--- src/io.c.orig 2020-08-06 17:06:40 UTC
++++ src/io.c
+@@ -136,13 +136,13 @@ void
+ int io_stop = 0;
+
+ void
+-io_signal()
++io_signal(int signo)
+ {
+ io_stop = 1;
+ }
+
+ void
+-io_signal_on()
++io_signal_on(void)
+ {
+ io_stop = 0;
+ signal(SIGINT, io_signal);
+@@ -150,7 +150,7 @@ void
+ }
+
+ void
+-io_signal_off()
++io_signal_off(void)
+ {
+ signal(SIGINT, SIG_DFL);
+ signal(SIGPIPE, SIG_DFL);
diff --git a/devel/pickle/files/patch-src_io.h b/devel/pickle/files/patch-src_io.h
new file mode 100644
index 000000000000..92e4aba33a8a
--- /dev/null
+++ b/devel/pickle/files/patch-src_io.h
@@ -0,0 +1,15 @@
+--- src/io.h.orig 2020-08-06 17:06:40 UTC
++++ src/io.h
+@@ -90,9 +90,9 @@ uint8_t io_backend(void);
+
+ /* prototypes */
+ uint8_t io_backend(void);
+-void io_signal();
+-void io_signal_on();
+-void io_signal_off();
++void io_signal(int);
++void io_signal_on(void);
++void io_signal_off(void);
+ void io_config(void);
+ int io_open(void);
+ void io_close(int);
diff --git a/devel/pickle/files/patch-src_pic14.c b/devel/pickle/files/patch-src_pic14.c
new file mode 100644
index 000000000000..e9dfd5349b21
--- /dev/null
+++ b/devel/pickle/files/patch-src_pic14.c
@@ -0,0 +1,142 @@
+--- src/pic14.c.orig 2026-05-14 09:57:55 UTC
++++ src/pic14.c
+@@ -1240,21 +1240,6 @@ pic14_row_erase_program_memory(uint32_t t)
+ io_usleep(t);
+ }
+
+-/*
+- * ROW ERASE MEMORY (NVM)
+- * RETURN (PC)
+- *
+- * X00101 = 0x05
+- *
+- * DS40001738C-page 7 16F18313
+- */
+-static inline void
+-pic14_row_erase_memory(uint32_t t)
+-{
+- io_program_out(0x05, 6);
+- io_usleep(t);
+-}
+-
+ /*****************************************************************************
+ *
+ * Compound functions
+@@ -1491,7 +1476,7 @@ pic14_row_erase(uint32_t row, uint32_t nrows)
+ if (row == PIC_ERASE_CONFIG) {
+ for (uint32_t i = 0; i < PIC14_CONFIG_MAX; ++i)
+ pic14_conf.config[i] = 0x3FFF;
+-
++
+ /* ERASE CONFIG */
+ pic14_write_config();
+ return;
+@@ -1788,7 +1773,7 @@ pic14_write_word(uint16_t region)
+ /* END PROGRAMMING */
+ pic14_end_programming_001110(PIC14_TDISCHARGE_DEFAULT);
+ break;
+-
++
+ case DS41284E: /* PIC12F615/617 BEGIN PROGRAMMING */
+ case DS41191C: /* PIC12F629/675 BEGIN PROGRAMMING */
+ /* PIC16F630/676 BEGIN PROGRAMMING */
+@@ -2506,19 +2491,19 @@ pic14_dumpconfig_12f675(uint16_t config)
+ case 2: printf("\t[BG1:BG0] 10\n"); break;
+ case 3: printf("\t[BG1:BG0] 11\n"); break;
+ }
+-
++
+ w = config & 0x100;
+ if (w)
+ printf("\n[CPD] Data memory code protection off\n");
+ else
+ printf("\n[CPD] Data memory code protection on\n");
+-
++
+ w = config & 0x80;
+ if (w)
+ printf("\n[CP] Program memory code protection off\n");
+ else
+ printf("\n[CP] Program memory code protection on\n");
+-
++
+ w = config & 0x40;
+ if (w)
+ printf("\n[BODEN] Brown-out detect reset enabled\n");
+@@ -2576,7 +2561,7 @@ pic14_dumpconfig_16f877a(uint16_t config)
+ printf("\n[DEBUG] In circuit debugger off\n");
+ else
+ printf("\n[DEBUG] In circuit debugger on\n");
+-
++
+ w = (config & 0x0600) >> 9;
+ printf("\nWrite protection:\n");
+ switch (w) {
+@@ -2794,7 +2779,7 @@ pic14_dumpconfig_12f683(uint16_t config)
+ printf("\n[FCMEN] Fail-safe clock monitor enabled\n");
+ else
+ printf("\n[FCMEN] Fail-safe clock monitor disabled\n");
+-
++
+ w = config & 0x0300;
+ printf("\nBrown-out reset selection:\n");
+ switch (w) {
+@@ -2809,13 +2794,13 @@ pic14_dumpconfig_12f683(uint16_t config)
+ printf("\n[CPD] Data memory code protection off\n");
+ else
+ printf("\n[CPD] Data memory code protection on\n");
+-
++
+ w = config & 0x0040;
+ if (w)
+ printf("\n[CP] Program memory code protection off\n");
+ else
+ printf("\n[CP] Program memory code protection on\n");
+-
++
+ w = config & 0x0020;
+ if (w)
+ printf("\n[MCLRE] MCLR enabled\n");
+@@ -2855,7 +2840,7 @@ pic14_dumpconfig_16f886(uint16_t config1, uint16_t con
+ pic14_dumpconfig_16f886(uint16_t config1, uint16_t config2)
+ {
+ uint16_t w;
+-
++
+ w = config1 & 0x2000;
+ if (w)
+ printf("\n[DEBUG] In circuit debugger off\n");
+@@ -2873,13 +2858,13 @@ pic14_dumpconfig_16f886(uint16_t config1, uint16_t con
+ printf("\n[FCMEN] Fail-safe clock monitor enabled\n");
+ else
+ printf("\n[FCMEN] Fail-safe clock monitor disabled\n");
+-
++
+ w = config1 & 0x0400;
+ if (w)
+ printf("\n[IESO] Internal/external switch over mode enabled\n");
+ else
+ printf("\n[IESO] Internal/external switch over mode disabled\n");
+-
++
+ w = config1 & 0x0300;
+ printf("\nBrown-out reset selection:\n");
+ switch (w) {
+@@ -2934,7 +2919,7 @@ pic14_dumpconfig_16f886(uint16_t config1, uint16_t con
+
+ w = (config2 & 0x0006) >> 1;
+ printf("\n[WRT1:WRT0] Write protection: 0x%02X\n", w);
+-
++
+ w = config2 & 0x0001;
+ if (w)
+ printf("\n[BOR4V] Brown-out reset set to 4.0V\n");
+@@ -3058,7 +3043,7 @@ pic14_dumpdevice(void)
+
+ /* Enhanced 14-bit: Extended address = 0x0001 (CONFIG: 0x8000) */
+ pic_dumpaddr(pic14_map[pic14_index].configaddr << 1, 1);
+-
++
+ /* USERID */
+ for (i = 0; i < 4; ++i)
+ pic_dumpword16(pic14_map[pic14_index].configaddr + i, pic14_conf.userid[i]);
diff --git a/devel/pickle/files/patch-src_pic14n.c b/devel/pickle/files/patch-src_pic14n.c
new file mode 100644
index 000000000000..41d32c5d9df0
--- /dev/null
+++ b/devel/pickle/files/patch-src_pic14n.c
@@ -0,0 +1,83 @@
+--- src/pic14n.c.orig 2020-08-04 03:14:51 UTC
++++ src/pic14n.c
+@@ -364,19 +364,6 @@ pic14n_read_data_from_nvm(uint8_t j /* 0 || 1 */)
+ }
+
+ /*
+- * INCREMENT ADDRESS
+- * 0xF8 PC = PC + 1
+- *
+- * DS40001753B-page 13
+- */
+-static inline void
+-pic14n_increment_address(void)
+-{
+- io_program_out(0xF8, 8);
+- /* TDLY 1us */
+-}
+-
+-/*
+ * LOAD PC ADDRESS
+ * 0x80 PC = address
+ *
+@@ -409,38 +396,6 @@ pic14n_begin_internally_timed_programming(uint32_t t)
+ io_usleep(t);
+ }
+
+-/*
+- * BEGIN EXTERNALLY TIMED PROGRAMMING
+- * 0xC0
+- *
+- * DS40001753B-page 14
+- *
+- * DS40001753B TPEXT(2.8ms PROGRAM) (NOT CONFIG)
+- */
+-static inline void
+-pic14n_begin_externally_timed_programming(uint32_t t)
+-{
+- io_program_out(0xC0, 8);
+- /* TPEXT */
+- io_usleep(t);
+-}
+-
+-/*
+- * END EXTERNALLY TIMED PROGRAMMING
+- * 0x82
+- *
+- * DS40001753B-page 14
+- *
+- * DS40001753B TDIS(300us PROGRAM)
+- */
+-static inline void
+-pic14n_end_externally_timed_programming(uint32_t t)
+-{
+- io_program_out(0x82, 8);
+- /* TDIS */
+- io_usleep(t);
+-}
+-
+ /*ERASE***********************************************************************/
+
+ /*
+@@ -459,21 +414,6 @@ pic14n_bulk_erase_memory(uint32_t t)
+ pic14n_bulk_erase_memory(uint32_t t)
+ {
+ io_program_out(0x18, 8);
+- io_usleep(t);
+-}
+-
+-/*
+- * ROW ERASE MEMORY (PRELOAD PC)
+- * 0xF0
+- *
+- * DS40001753B-page 15
+- *
+- * DS40001753B TERAR(2.8ms)
+- */
+-static inline void
+-pic14n_row_erase_memory(uint32_t t)
+-{
+- io_program_out(0xF0, 8);
+ io_usleep(t);
+ }
+
diff --git a/devel/pickle/files/patch-src_pic16n.c b/devel/pickle/files/patch-src_pic16n.c
new file mode 100644
index 000000000000..7fd09c6408e1
--- /dev/null
+++ b/devel/pickle/files/patch-src_pic16n.c
@@ -0,0 +1,92 @@
+--- src/pic16n.c.orig 2026-05-14 09:55:47 UTC
++++ src/pic16n.c
+@@ -373,22 +373,6 @@ pic16n_read_data_from_nvm(uint8_t j /* 0 || 1 */)
+ }
+
+ /*
+- * INCREMENT ADDRESS
+- * 0xF8 PC = PC + 2 CODE
+- * 0xF8 PC = PC + 1 DATA
+- *
+- * DS40001772B-page 10
+- * DS40001874F-page 10
+- * DS40002079D-page 13
+- */
+-static inline void
+-pic16n_increment_address(void)
+-{
+- io_program_out(0xF8, 8);
+- /* TDLY 1us */
+-}
+-
+-/*
+ * LOAD PC ADDRESS
+ * 0x80 PC = address
+ *
+@@ -423,36 +407,6 @@ pic16n_begin_internally_timed_programming(uint32_t t)
+ }
+
+ /*
+- * BEGIN EXTERNALLY TIMED PROGRAMMING
+- * 0xC0
+- *
+- * DS40001772B-page 12
+- * DS40001772B TPEXT(2.1ms PROGRAM) (NOT CONFIG)
+- */
+-static inline void
+-pic16n_begin_externally_timed_programming(uint32_t t)
+-{
+- io_program_out(0xC0, 8);
+- /* TPEXT */
+- io_usleep(t);
+-}
+-
+-/*
+- * END EXTERNALLY TIMED PROGRAMMING
+- * 0x82
+- *
+- * DS40001772B-page 12
+- * DS40001772B TDIS(300us PROGRAM)
+- */
+-static inline void
+-pic16n_end_externally_timed_programming(uint32_t t)
+-{
+- io_program_out(0x82, 8);
+- /* TDIS */
+- io_usleep(t);
+-}
+-
+-/*
+ * PROGRAM DATA COMMAND
+ * 0xC0 PC = PC
+ * 0xE0 PC = PC + 2
+@@ -518,20 +472,6 @@ pic16n_bulk_erase_memory_Q43(uint32_t t)
+ io_usleep(t);
+ }
+
+-/*
+- * ROW ERASE MEMORY (PRELOAD PC)
+- * 0xF0
+- *
+- * DS40001772B-page 12
+- * DS40001772B TERAR(2.8ms)
+- */
+-static inline void
+-pic16n_row_erase_memory(uint32_t t)
+-{
+- io_program_out(0xF0, 8);
+- io_usleep(t);
+-}
+-
+ /*****************************************************************************
+ *
+ * Compound functions
+@@ -1360,7 +1300,7 @@ pic16n_dumpdeviceid(void)
+ pic16n_conf.revisionid,
+ (pic16n_conf.revisionid >> PIC16N_MAJOR_SHIFT) & PIC16N_REV_MASK,
+ pic16n_conf.revisionid & PIC16N_REV_MASK);
+- printf("[3FFFFE] [DEVICEID] %04X %s\n", pic16n_conf.deviceid,
++ printf("[3FFFFE] [DEVICEID] %04X %s\n", pic16n_conf.deviceid,
+ pic16n_map[pic16n_index].devicename);
+ }
+