Hi Markus,

On 2017-09-20 17:17, Markus Pfeiffer wrote:
the following patch makes chicken build for DragonFly again (and hence
after a release would make it possible to include it in dports, etc).

Thanks a lot, we appreciate it.

Here are signoffs for both master and chicken-5.

Best,

Evan
>From 2535ced16ac7c5610662260dc9d12dd73d53d1b1 Mon Sep 17 00:00:00 2001
From: Markus Pfeiffer <markus.pfeif...@morphism.de>
Date: Thu, 21 Sep 2017 10:08:30 +1200
Subject: [PATCH] Disable feature macros on DragonFly BSD

This allows CHICKEN to build on DragonFly without modification.

Thanks to Markus Pfeiffer for the patch.

Signed-off-by: Evan Hanson <ev...@foldling.org>
---
 Makefile.bsd            |  4 ++--
 manual/Acknowledgements | 38 +++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Makefile.bsd b/Makefile.bsd
index 09c68ac5..6b0db786 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -101,8 +101,8 @@ endif
 ifdef SYMBOLGC
 	echo "#define C_COLLECT_ALL_SYMBOLS" >>$@
 endif
-# Of the BSDs, only FreeBSD hates composable feature macros...
-	echo "#ifndef __FreeBSD__" >> $@
+# Feature macros are unsupported on FreeBSD and DragonFly
+	echo "#if !defined(__FreeBSD__) && !defined(__DragonFly__)" >> $@
 	echo "# define C_USE_STD_FEATURE_MACROS" >> $@
 	echo "#endif" >> $@
 	cat chicken-defaults.h >>$@
diff --git a/manual/Acknowledgements b/manual/Acknowledgements
index 42328214..bca1855c 100644
--- a/manual/Acknowledgements
+++ b/manual/Acknowledgements
@@ -35,25 +35,25 @@ Alain Mellan, Eric Merrit, Perry Metzger, Scott G. Miller, Mikael,
 Karel Miklav, Bruce Mitchener, Fadi Moukayed, Chris Moline, Eric
 E. Moore, Julian Morrison, Dan Muresan, David N. Murray, Timo Myyrä,
 "nicktick", Lars Nilsson, Ian Oversby, "o.t.", Gene Pavlovsky, Levi
-Pearson, Jeronimo Pellegrini, Nicolas Pelletier, Derrell Piper, Carlos
-Pita, "Pluijzer", Robin Lee Powell, Alan Post, "Pupeno", Davide
-Puricelli, "presto", Doug Quale, Imran Rafique, Eric Raible, Ivan
-Raikov, Santosh Rajan, Joel Reymont, "rivo", Chris Roberts, Eric
-Rochester, Paul Romanchenko, Andreas Rottman, David Rush, Lars
-Rustemeier, Daniel Sadilek, Otavio Salvador, Burton Samograd,
-"Sandro", "satori", Aleksej Saushev, Oskar Schirmer, Reed Sheridan,
-Vasilij Schneidermann, Ronald Schröder, Spencer Schumann, Ivan
-Shcheklein, Alexander Shendi, Alex Shinn, Ivan Shmakov, "Shmul", Tony
-Sidaway, Jeffrey B. Siegal, Andrey Sidorenko, Michele Simionato, Iruata
-Souza, Volker Stolz, Jon Strait, Dorai Sitaram, Robert Skeels, Jason
-Songhurst, Clifford Stein, David Steiner, Sunnan, Zbigniew Szadkowski,
-Rick Taube, Nathan Thern, Mike Thomas, Minh Thu, Christian Tismer, Andre
-van Tonder, John Tobey, Henrik Tramberend, Vladimir Tsichevsky, James
-Ursetto, Neil van Dyke, Sam Varner, Taylor Venable, Sander Vesik, Jaques
-Vidrine, Panagiotis Vossos, Shawn Wagner, Peter Wang, Ed Watkeys, Brad
-Watson, Thomas Weidner, Göran Weinholt, Matthew Welland, Drake Wilson,
-Jörg Wittenberger, Peter Wright, Mark Wutka, Adam Young, Richard
-Zidlicky, Houman Zolfaghari and Florian Zumbiehl for bug-fixes, tips and
+Pearson, Jeronimo Pellegrini, Nicolas Pelletier, Markus Pfeiffer,
+Derrell Piper, Carlos Pita, "Pluijzer", Robin Lee Powell, Alan Post,
+"Pupeno", Davide Puricelli, "presto", Doug Quale, Imran Rafique, Eric
+Raible, Ivan Raikov, Santosh Rajan, Joel Reymont, "rivo", Chris Roberts,
+Eric Rochester, Paul Romanchenko, Andreas Rottman, David Rush, Lars
+Rustemeier, Daniel Sadilek, Otavio Salvador, Burton Samograd, "Sandro",
+"satori", Aleksej Saushev, Oskar Schirmer, Reed Sheridan, Vasilij
+Schneidermann, Ronald Schröder, Spencer Schumann, Ivan Shcheklein,
+Alexander Shendi, Alex Shinn, Ivan Shmakov, "Shmul", Tony Sidaway,
+Jeffrey B. Siegal, Andrey Sidorenko, Michele Simionato, Iruata Souza,
+Volker Stolz, Jon Strait, Dorai Sitaram, Robert Skeels, Jason Songhurst,
+Clifford Stein, David Steiner, Sunnan, Zbigniew Szadkowski, Rick Taube,
+Nathan Thern, Mike Thomas, Minh Thu, Christian Tismer, Andre van Tonder,
+John Tobey, Henrik Tramberend, Vladimir Tsichevsky, James Ursetto, Neil
+van Dyke, Sam Varner, Taylor Venable, Sander Vesik, Jaques Vidrine,
+Panagiotis Vossos, Shawn Wagner, Peter Wang, Ed Watkeys, Brad Watson,
+Thomas Weidner, Göran Weinholt, Matthew Welland, Drake Wilson, Jörg
+Wittenberger, Peter Wright, Mark Wutka, Adam Young, Richard Zidlicky,
+Houman Zolfaghari and Florian Zumbiehl for bug-fixes, tips and
 suggestions.
 
 Special thanks to Brandon van Every for contributing the (now defunct)
-- 
2.11.0

>From 38a81ce72a3484428c4d3c93e1c8ee53ce2f9529 Mon Sep 17 00:00:00 2001
From: Markus Pfeiffer <markus.pfeif...@morphism.de>
Date: Thu, 21 Sep 2017 10:17:31 +1200
Subject: [PATCH] Disable feature macros on DragonFly BSD

This allows CHICKEN to build on DragonFly without modification.

Thanks to Markus Pfeiffer for the patch.

Signed-off-by: Evan Hanson <ev...@foldling.org>
---
 Makefile.bsd            |  4 ++--
 manual/Acknowledgements | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile.bsd b/Makefile.bsd
index cb069447..d54a7351 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -98,8 +98,8 @@ chicken-config.h: chicken-defaults.h
 ifdef GCHOOKS
 	echo "#define C_GC_HOOKS" >>$@
 endif
-# Of the BSDs, only FreeBSD hates composable feature macros...
-	echo "#ifndef __FreeBSD__" >> $@
+# Feature macros are unsupported on FreeBSD and DragonFly
+	echo "#if !defined(__FreeBSD__) && !defined(__DragonFly__)" >> $@
 	echo "# define C_USE_STD_FEATURE_MACROS" >> $@
 	echo "#endif" >> $@
 	cat chicken-defaults.h >>$@
diff --git a/manual/Acknowledgements b/manual/Acknowledgements
index 0fb7493d..cb2904d0 100644
--- a/manual/Acknowledgements
+++ b/manual/Acknowledgements
@@ -36,21 +36,21 @@ Perry Metzger, Scott G. Miller, Mikael, Karel Miklav, Bruce Mitchener,
 Fadi Moukayed, Chris Moline, Eric E. Moore, Julian Morrison,
 Dan Muresan, David N. Murray, Timo Myyrä, "nicktick", Lars Nilsson,
 Ian Oversby, "o.t.", Gene Pavlovsky, Levi Pearson, Jeronimo Pellegrini,
-Nicolas Pelletier, Derrell Piper, Carlos Pita, "Pluijzer",
-Robin Lee Powell, Alan Post, "Pupeno", Davide Puricelli, "presto",
-Doug Quale, Imran Rafique, Eric Raible, Ivan Raikov, Santosh Rajan,
-Joel Reymont, "rivo", Chris Roberts, Eric Rochester, Paul Romanchenko,
-Andreas Rottman, David Rush, Lars Rustemeier, Daniel Sadilek,
-Otavio Salvador, Burton Samograd, "Sandro", "satori", Aleksej Saushev,
-Oskar Schirmer, Vasilij Schneidermann, Reed Sheridan, Ronald Schröder,
-Spencer Schumann, Ivan Shcheklein, Alexander Shendi, Alex Shinn, Ivan
-Shmakov, "Shmul", Tony Sidaway, Jeffrey B. Siegal, Andrey Sidorenko,
-Michele Simionato, Iruata Souza, Volker Stolz, Jon Strait, Dorai
-Sitaram, Robert Skeels, Jason Songhurst, Clifford Stein, David Steiner,
-Sunnan, Zbigniew Szadkowski, Rick Taube, Nathan Thern, Mike Thomas, Minh
-Thu, Christian Tismer, Andre van Tonder, John Tobey, Henrik Tramberend,
-Vladimir Tsichevsky, James Ursetto, Neil van Dyke, Sam Varner,
-Taylor Venable, Sander Vesik, Jaques Vidrine, Panagiotis Vossos,
+Nicolas Pelletier, Markus Pfeiffer, Derrell Piper, Carlos Pita,
+"Pluijzer", Robin Lee Powell, Alan Post, "Pupeno", Davide Puricelli,
+"presto", Doug Quale, Imran Rafique, Eric Raible, Ivan Raikov, Santosh
+Rajan, Joel Reymont, "rivo", Chris Roberts, Eric Rochester, Paul
+Romanchenko, Andreas Rottman, David Rush, Lars Rustemeier, Daniel
+Sadilek, Otavio Salvador, Burton Samograd, "Sandro", "satori", Aleksej
+Saushev, Oskar Schirmer, Vasilij Schneidermann, Reed Sheridan, Ronald
+Schröder, Spencer Schumann, Ivan Shcheklein, Alexander Shendi, Alex
+Shinn, Ivan Shmakov, "Shmul", Tony Sidaway, Jeffrey B. Siegal, Andrey
+Sidorenko, Michele Simionato, Iruata Souza, Volker Stolz, Jon Strait,
+Dorai Sitaram, Robert Skeels, Jason Songhurst, Clifford Stein, David
+Steiner, Sunnan, Zbigniew Szadkowski, Rick Taube, Nathan Thern, Mike
+Thomas, Minh Thu, Christian Tismer, Andre van Tonder, John Tobey, Henrik
+Tramberend, Vladimir Tsichevsky, James Ursetto, Neil van Dyke, Sam
+Varner, Taylor Venable, Sander Vesik, Jaques Vidrine, Panagiotis Vossos,
 Shawn Wagner, Peter Wang, Ed Watkeys, Brad Watson, Thomas Weidner, Göran
 Weinholt, Matthew Welland, Drake Wilson, Jörg Wittenberger, Peter
 Wright, Mark Wutka, Adam Young, Richard Zidlicky, Houman Zolfaghari and
-- 
2.11.0

_______________________________________________
Chicken-hackers mailing list
Chicken-hackers@nongnu.org
https://lists.nongnu.org/mailman/listinfo/chicken-hackers

Reply via email to