From a8b4624387f580759739aa064e3f489bf28afeae Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Sat, 25 Apr 2020 13:01:33 -0400
Subject: Replace wcwidth implementation with that of musl

Imported from musl 1.2.0 sources.
---
 port/wcwidth/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'port/wcwidth/Makefile')

diff --git a/port/wcwidth/Makefile b/port/wcwidth/Makefile
index 4fbb2863..f6932d6d 100644
--- a/port/wcwidth/Makefile
+++ b/port/wcwidth/Makefile
@@ -1,13 +1,16 @@
 PREFIX = ~/.local
 
-CFLAGS = -Dmk_wcwidth=wcwidth -Dmk_wcswidth=wcswidth
-
-OBJS = wcwidth.o
+OBJS = wcwidth.o wcswidth.o
 DYLIB = libwcwidth.dylib
 
 ${DYLIB}: ${OBJS}
 	${CC} -dynamiclib ${LDFLAGS} ${OBJS} -o $@
 
+wcwidth.o: nonspacing.h wide.h
+
+clean:
+	rm -f ${DYLIB} ${OBJS}
+
 install: ${DYLIB}
 	install -d ${PREFIX}/lib
 	install -m 644 ${DYLIB} ${PREFIX}/lib
-- 
cgit 1.4.1

</tr></table>
<table class='tabs'><tr><td>
<a href='/src/'>summary</a> <a href='/src/refs/?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2'>refs</a> <a class='active' href='/src/log/port/ddate/.gitignore?follow=1'>log</a> <a href='/src/tree/port/ddate/.gitignore?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2'>tree</a> <a href='/src/commit/port/ddate/.gitignore?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2&amp;follow=1'>commit</a> <a href='/src/diff/port/ddate/.gitignore?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/port/ddate/.gitignore'>
<input type='hidden' name='id' value='9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2&amp;follow=1'>root</a>/<a href='/src/log/port?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2&amp;follow=1'>port</a>/<a href='/src/log/port/ddate?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2&amp;follow=1'>ddate</a>/<a href='/src/log/port/ddate/.gitignore?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2&amp;follow=1'>.gitignore</a> (<a href='/src/log/port/ddate/.gitignore?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/port/ddate/.gitignore?id=9efb52aadc5c3c65701b998a5adcca8cb8b4a8c2&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span class='age-hours' title='2024-10-12 17:53:09 -0400'>19 hours</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-06/lens?id=300e2dd0e4cea019f0d247b90226fdf3fa5759c7&amp;follow=1'>Add photos from October 6</a></td><td>June McEnroe</td></tr>
<tr><td><span class='age-hours' title='2024-10-12 10:28:02 -0400'>26 hours</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-05/lens?id=8896a95764f011c24d0817c07e23bfa4887f7da1&amp;follow=1'>Add photos from October 5</a></td><td>June McEnroe</td></tr>
<tr><td><span class='age-days' title='2024-10-09 22:12:27 -0400'>4 days</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-10-01/lens?id=a147012a38017ee519ce35b3acbb0e55f3638f7b&amp;follow=1'>Add photos from October 1</a></td><td>June McEnroe</td></tr>
<tr><td><span class='age-days' title='2024-10-07 19:16:29 -0400'>6 days</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-29/lens?id=1dde71aa57ac73f9f15b8a9666c36b2173bb4592&amp;follow=1'>Add photos from September 29</a></td><td>June McEnroe</td></tr>
<tr><td><span class='age-days' title='2024-10-07 18:05:03 -0400'>6 days</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-28/lens?id=078d89ff74d02fd854f8de93fe225e6670644d50&amp;follow=1'>Add photos from September 28</a></td><td>June McEnroe</td></tr>
<tr><td><span class='age-days' title='2024-10-07 14:57:20 -0400'>6 days</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-22/lens?id=1215130a85ee9abe70d2e2c8af4eb0be368f4294&amp;follow=1'>Add photos from September 22</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-25 10:05:37 -0400'>2024-09-25</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-15/lens?id=1a4a0628513359733a2450cf38e73166f7e5cbe6&amp;follow=1'>Add photos from September 15</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 18:06:38 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-14/lens?id=16992208ec0549fdbc776da35c9f799126d15d89&amp;follow=1'>Add photos from September 14</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 10:13:27 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-12/lens?id=de6decda3177ae64859be30d68ba1e3c4c132ec1&amp;follow=1'>Add photos from September 12</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 09:50:19 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-07/lens?id=49a105101493f4dd51259dd62dcbd24df0909bd3&amp;follow=1'>Add photos from September 7</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-24 09:48:24 -0400'>2024-09-24</span></td><td><a href='/src/commit/www/photo.causal.agency/generate.sh?id=55728948b94a17b99fabeb1c61d20c5ef18c7f73&amp;follow=1'>Allow not having descriptions</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-23 17:44:15 -0400'>2024-09-23</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=9a38d0932d64b4a2ed5a6a2499490094d3bf8e7e&amp;follow=1'>Automatically select the last used lens for a body</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-19 23:20:42 -0400'>2024-09-19</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-05/lens?id=894873c86c5397a92499de39b4c52b5e99801441&amp;follow=1'>Add photos from September 5</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-15 16:02:27 -0400'>2024-09-15</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=32b69f7df4c155d7a09f140a53c3b39a330027e4&amp;follow=1'>Add some more film stocks to the list</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-13 20:06:35 -0400'>2024-09-13</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-09-02/lens?id=45e859f37e503f2c85a3085a628226831e394b7b&amp;follow=1'>Add photos from September 2</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-13 12:54:24 -0400'>2024-09-13</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=57e90a2d8f5f9b6385ffeb0e0e7b3237cb395b80&amp;follow=1'>Add Fomapan 200 to films list</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-10 20:30:28 -0400'>2024-09-10</span></td><td><a href='/src/commit/www/photo.causal.agency/2024-08-29/lens?id=1134af7da7776a0631995094a9225ce3541a9518&amp;follow=1'>Add August 29 picnic photos</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:44:08 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=775260288133dc90bb600785772ac931854aa618&amp;follow=1'>Apply some bold to trips rendering</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:38:22 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=dd7fda85bcc69cd4cd35e006cffabf3bdf765104&amp;follow=1'>Render trips hopefully more efficiently</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 19:26:18 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=02cac2ffadee1d3f66426bb48a64aea78907878c&amp;follow=1'>Allow removing bodies and lenses</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-08 10:59:25 -0400'>2024-09-08</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=2c25b7204ecab1be0d128d984eabe35b10a3a418&amp;follow=1'>Limit body width so it looks less silly on desktop</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-07 21:02:03 -0400'>2024-09-07</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=74df90da35ed7886c4067fae700c9db1d3b2ef0a&amp;follow=1'>Handle no film being loaded</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2024-09-07 20:58:45 -0400'>2024-09-07</span></td><td><a href='/src/commit/www/photo.causal.agency/trips.html?id=a7f8aa5246afbf9c01ca295bdd2af0e11faeb7d3&amp;follow=1'>Fancy up the text a little</a></td><td>June McEnroe