diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2023-08-21 07:08:22 -0400 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2023-08-21 07:15:13 -0400 |
| commit | 52382727a5c20bcfb142cbadced9a4b913abbdd4 (patch) | |
| tree | 2fcd5e99d24a42541d28e35a13fc4731fe41d595 /misc/nut/files/patch-anameal.c | |
| parent | devel/onetbb: Update to 2021.10.0 (diff) | |
misc/nut: Fix linking when FLTK option is on
While here, use more options helpers and add a few missing XORG deps.
Reported by: Andrew Xiang <andrewxiang@gmail.com> via jbeich
Diffstat (limited to '')
| -rw-r--r-- | misc/nut/files/patch-anameal.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/misc/nut/files/patch-anameal.c b/misc/nut/files/patch-anameal.c new file mode 100644 index 000000000000..10bfd40f6e47 --- /dev/null +++ b/misc/nut/files/patch-anameal.c @@ -0,0 +1,28 @@ +Fix linker error when FLTK option is enabled. + +ld: error: duplicate symbol: foodwork +>>> defined at anameal.c +>>> ../anameal.o:(foodwork) +>>> defined at PersonalOptions.cc +>>> PersonalOptions.o:(.bss+0x0) + +--- anameal.c.orig 2023-08-21 10:50:52 UTC ++++ anameal.c +@@ -29,7 +29,7 @@ + #include <strings.h> + #include <time.h> + +-struct food *foodwork; ++struct food *foodwork_cli; + int max; + + void analyze_meals(struct meal *meal_ptr_origin, int specialheader) +@@ -43,7 +43,7 @@ float prodefic, thispct, totaldefic, serving_ratio; + float deficpct[DV_COUNT], food_abacus[MAX_FOOD], serving_ratio_abacus[MAX_FOOD]; + int deficnut[DV_COUNT]; + float prodefic, thispct, totaldefic, serving_ratio; +-foodwork = &food_work; ++foodwork_cli = &food_work; + options.temp_meal_root = meal_ptr_origin; + mealcount = meal_count(meal_ptr_origin); + max = mealcount; |