commit 429b4bdce52341b04f33fa137bb6e37d96787191 · pyrox.dev/nixpkgs

-338

pkgs/by-name/el/elfutils/cxx-header-collision.patch

···

       1
       1
       -
       From: Tristan Ross <tristan.ross@midstall.com>

     

       2
       2
       -
       Date: Wed, 31 Jul 2024 04:03:03 +0000 (-0700)

     

       3
       3
       -
       Subject: Prevent binaries in src from colliding with libc++ headers

     

       4
       4
       -
       X-Git-Url: https://sourceware.org/git/?p=elfutils.git;a=commitdiff_plain;h=232b9ede92cbecabbd61291c2fc9aaf3fc61061f;hp=87a60d22299c4ba7b94cbce04a32c2abf015f98a

     

       5
       5
       -
       

     

       6
       6
       -
       Prevent binaries in src from colliding with libc++ headers

     

       7
       7
       -
       

     

       8
       8
       -
       Discovered with Nix and LLVM 17. Headers inside of libc++ can easily

     

       9
       9
       -
       collide with binaries being linked in src. This results in clang trying

     

       10
       10
       -
       to include a binary as a header.

     

       11
       11
       -
       

     

       12
       12
       -
       Fix this by removing '-I.' and '-I$(srcdir)' from AM_CPPFLAGS and

     

       13
       13
       -
       DEFAULT_INCLUDES in src/Makefile.am.

     

       14
       14
       -
       

     

       15
       15
       -
       To facilitate this config/eu.am has been refactored.  New file

     

       16
       16
       -
       config/eu-common.am contains all of the old eu.am but with the

     

       17
       17
       -
       AM_CPPFLAGS definition removed. eu.am now includes eu-common.am and

     

       18
       18
       -
       contains the old AM_CPPFLAGS definition.

     

       19
       19
       -
       

     

       20
       20
       -
       eu.am functionality does not change, but src/Makefile.am can instead

     

       21
       21
       -
       include eu-common.am and define its own AM_CPPFLAGS without causing a

     

       22
       22
       -
       "multiply defined" warning during autoreconf.

     

       23
       23
       -
       

     

       24
       24
       -
       Signed-off-by: Tristan Ross <tristan.ross@midstall.com>

     

       25
       25
       -
       ---

     

       26
       26
       -
       

     

       27
       27
       -
       diff --git a/config/eu-common.am b/config/eu-common.am

     

       28
       28
       -
       new file mode 100644

     

       29
       29
       -
       index 00000000..9cc7f696

     

       30
       30
       -
       --- /dev/null

     

       31
       31
       -
       +++ b/config/eu-common.am

     

       32
       32
       -
       @@ -0,0 +1,148 @@

     

       33
       33
       -
       +## Common automake fragments for elfutils subdirectory makefiles.

     

       34
       34
       -
       +##

     

       35
       35
       -
       +## Copyright (C) 2010, 2014, 2016 Red Hat, Inc.

     

       36
       36
       -
       +## Copyright (C) 2023, Mark J. Wielaard <mark@klomp.org>

     

       37
       37
       -
       +##

     

       38
       38
       -
       +## This file is part of elfutils.

     

       39
       39
       -
       +##

     

       40
       40
       -
       +## This file is free software; you can redistribute it and/or modify

     

       41
       41
       -
       +## it under the terms of either

     

       42
       42
       -
       +##

     

       43
       43
       -
       +##   * the GNU Lesser General Public License as published by the Free

     

       44
       44
       -
       +##     Software Foundation; either version 3 of the License, or (at

     

       45
       45
       -
       +##     your option) any later version

     

       46
       46
       -
       +##

     

       47
       47
       -
       +## or

     

       48
       48
       -
       +##

     

       49
       49
       -
       +##   * the GNU General Public License as published by the Free

     

       50
       50
       -
       +##     Software Foundation; either version 2 of the License, or (at

     

       51
       51
       -
       +##     your option) any later version

     

       52
       52
       -
       +##

     

       53
       53
       -
       +## or both in parallel, as here.

     

       54
       54
       -
       +##

     

       55
       55
       -
       +## elfutils is distributed in the hope that it will be useful, but

     

       56
       56
       -
       +## WITHOUT ANY WARRANTY; without even the implied warranty of

     

       57
       57
       -
       +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

     

       58
       58
       -
       +## General Public License for more details.

     

       59
       59
       -
       +##

     

       60
       60
       -
       +## You should have received copies of the GNU General Public License and

     

       61
       61
       -
       +## the GNU Lesser General Public License along with this program.  If

     

       62
       62
       -
       +## not, see <http://www.gnu.org/licenses/>.

     

       63
       63
       -
       +##

     

       64
       64
       -
       +

     

       65
       65
       -
       +DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'

     

       66
       66
       -
       +

     

       67
       67
       -
       +# Drop the 'u' flag that automake adds by default. It is incompatible

     

       68
       68
       -
       +# with deterministic archives.

     

       69
       69
       -
       +ARFLAGS = cr

     

       70
       70
       -
       +

     

       71
       71
       -
       +# Warn about stack usage of more than 256K = 262144 bytes.

     

       72
       72
       -
       +if ADD_STACK_USAGE_WARNING

     

       73
       73
       -
       +STACK_USAGE_WARNING=-Wstack-usage=262144

     

       74
       74
       -
       +STACK_USAGE_NO_ERROR=-Wno-error=stack-usage=

     

       75
       75
       -
       +else

     

       76
       76
       -
       +STACK_USAGE_WARNING=

     

       77
       77
       -
       +STACK_USAGE_NO_ERROR=

     

       78
       78
       -
       +endif

     

       79
       79
       -
       +

     

       80
       80
       -
       +if SANE_LOGICAL_OP_WARNING

     

       81
       81
       -
       +LOGICAL_OP_WARNING=-Wlogical-op

     

       82
       82
       -
       +else

     

       83
       83
       -
       +LOGICAL_OP_WARNING=

     

       84
       84
       -
       +endif

     

       85
       85
       -
       +

     

       86
       86
       -
       +if HAVE_DUPLICATED_COND_WARNING

     

       87
       87
       -
       +DUPLICATED_COND_WARNING=-Wduplicated-cond

     

       88
       88
       -
       +else

     

       89
       89
       -
       +DUPLICATED_COND_WARNING=

     

       90
       90
       -
       +endif

     

       91
       91
       -
       +

     

       92
       92
       -
       +if HAVE_NULL_DEREFERENCE_WARNING

     

       93
       93
       -
       +NULL_DEREFERENCE_WARNING=-Wnull-dereference

     

       94
       94
       -
       +else

     

       95
       95
       -
       +NULL_DEREFERENCE_WARNING=

     

       96
       96
       -
       +endif

     

       97
       97
       -
       +

     

       98
       98
       -
       +if HAVE_IMPLICIT_FALLTHROUGH_WARNING

     

       99
       99
       -
       +# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the

     

       100
       100
       -
       +# warning

     

       101
       101
       -
       +if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING

     

       102
       102
       -
       +IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5

     

       103
       103
       -
       +else

     

       104
       104
       -
       +IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough

     

       105
       105
       -
       +endif

     

       106
       106
       -
       +else

     

       107
       107
       -
       +IMPLICIT_FALLTHROUGH_WARNING=

     

       108
       108
       -
       +endif

     

       109
       109
       -
       +

     

       110
       110
       -
       +if HAVE_TRAMPOLINES_WARNING

     

       111
       111
       -
       +TRAMPOLINES_WARNING=-Wtrampolines

     

       112
       112
       -
       +else

     

       113
       113
       -
       +TRAMPOLINES_WARNING=

     

       114
       114
       -
       +endif

     

       115
       115
       -
       +

     

       116
       116
       -
       +if HAVE_NO_PACKED_NOT_ALIGNED_WARNING

     

       117
       117
       -
       +NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned

     

       118
       118
       -
       +else

     

       119
       119
       -
       +NO_PACKED_NOT_ALIGNED_WARNING=

     

       120
       120
       -
       +endif

     

       121
       121
       -
       +

     

       122
       122
       -
       +if HAVE_USE_AFTER_FREE3_WARNING

     

       123
       123
       -
       +USE_AFTER_FREE3_WARNING=-Wuse-after-free=3

     

       124
       124
       -
       +else

     

       125
       125
       -
       +USE_AFTER_FREE3_WARNING=

     

       126
       126
       -
       +endif

     

       127
       127
       -
       +

     

       128
       128
       -
       +AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \

     

       129
       129
       -
       +	    -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \

     

       130
       130
       -
       +	    $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \

     

       131
       131
       -
       +	    $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \

     

       132
       132
       -
       +	    $(USE_AFTER_FREE3_WARNING) \

     

       133
       133
       -
       +	    $(if $($(*F)_no_Werror),,-Werror) \

     

       134
       134
       -
       +	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \

     

       135
       135
       -
       +	    $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \

     

       136
       136
       -
       +	    $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \

     

       137
       137
       -
       +	    $($(*F)_CFLAGS)

     

       138
       138
       -
       +

     

       139
       139
       -
       +AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \

     

       140
       140
       -
       +	   $(TRAMPOLINES_WARNING) \

     

       141
       141
       -
       +	   $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \

     

       142
       142
       -
       +	   $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \

     

       143
       143
       -
       +	   $(if $($(*F)_no_Werror),,-Werror) \

     

       144
       144
       -
       +	   $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \

     

       145
       145
       -
       +	   $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \

     

       146
       146
       -
       +	   $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \

     

       147
       147
       -
       +	   $($(*F)_CXXFLAGS)

     

       148
       148
       -
       +

     

       149
       149
       -
       +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))

     

       150
       150
       -
       +

     

       151
       151
       -
       +DEFS.os = -DPIC -DSHARED

     

       152
       152
       -
       +if SYMBOL_VERSIONING

     

       153
       153
       -
       +DEFS.os += -DSYMBOL_VERSIONING

     

       154
       154
       -
       +else

     

       155
       155
       -
       +endif

     

       156
       156
       -
       +

     

       157
       157
       -
       +%.os: %.c %.o

     

       158
       158
       -
       +if AMDEP

     

       159
       159
       -
       +	$(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \

     

       160
       160
       -
       +	  -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \

     

       161
       161
       -
       +	then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \

     

       162
       162
       -
       +	     rm -f "$(DEPDIR)/$*.Tpo"; \

     

       163
       163
       -
       +	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \

     

       164
       164
       -
       +	fi

     

       165
       165
       -
       +else

     

       166
       166
       -
       +	$(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $<

     

       167
       167
       -
       +endif

     

       168
       168
       -
       +

     

       169
       169
       -
       +CLEANFILES = *.gcno *.gcda

     

       170
       170
       -
       +

     

       171
       171
       -
       +textrel_msg = echo "WARNING: TEXTREL found in '$@'"

     

       172
       172
       -
       +if FATAL_TEXTREL

     

       173
       173
       -
       +textrel_found = $(textrel_msg); exit 1

     

       174
       174
       -
       +else

     

       175
       175
       -
       +textrel_found = $(textrel_msg)

     

       176
       176
       -
       +endif

     

       177
       177
       -
       +textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi

     

       178
       178
       -
       +

     

       179
       179
       -
       +print-%:

     

       180
       180
       -
       +	@echo $*=$($*)

     

       181
       181
       -
       diff --git a/config/eu.am b/config/eu.am

     

       182
       182
       -
       index 0b7dab5b..3aa6048a 100644

     

       183
       183
       -
       --- a/config/eu.am

     

       184
       184
       -
       +++ b/config/eu.am

     

       185
       185
       -
       @@ -1,4 +1,5 @@

     

       186
       186
       -
       -## Common automake fragments for elfutils subdirectory makefiles.

     

       187
       187
       -
       +## Common automake fragments for elfutils subdirectory makefiles

     

       188
       188
       -
       +## with AM_CPPFLAGS set.

     

       189
       189
       -
        ##

     

       190
       190
       -
        ## Copyright (C) 2010, 2014, 2016 Red Hat, Inc.

     

       191
       191
       -
        ## Copyright (C) 2023, Mark J. Wielaard <mark@klomp.org>

     

       192
       192
       -
       @@ -30,120 +31,5 @@

     

       193
       193
       -
        ## not, see <http://www.gnu.org/licenses/>.

     

       194
       194
       -
        ##

     

       195
       195
       -
        

     

       196
       196
       -
       -DEFS = -D_GNU_SOURCE -DHAVE_CONFIG_H -DLOCALEDIR='"${localedir}"'

     

       197
       197
       -
       -AM_CPPFLAGS = -iquote . -I$(srcdir) -I$(top_srcdir)/lib -I..

     

       198
       198
       -
       -

     

       199
       199
       -
       -# Drop the 'u' flag that automake adds by default. It is incompatible

     

       200
       200
       -
       -# with deterministic archives.

     

       201
       201
       -
       -ARFLAGS = cr

     

       202
       202
       -
       -

     

       203
       203
       -
       -# Warn about stack usage of more than 256K = 262144 bytes.

     

       204
       204
       -
       -if ADD_STACK_USAGE_WARNING

     

       205
       205
       -
       -STACK_USAGE_WARNING=-Wstack-usage=262144

     

       206
       206
       -
       -STACK_USAGE_NO_ERROR=-Wno-error=stack-usage=

     

       207
       207
       -
       -else

     

       208
       208
       -
       -STACK_USAGE_WARNING=

     

       209
       209
       -
       -STACK_USAGE_NO_ERROR=

     

       210
       210
       -
       -endif

     

       211
       211
       -
       -

     

       212
       212
       -
       -if SANE_LOGICAL_OP_WARNING

     

       213
       213
       -
       -LOGICAL_OP_WARNING=-Wlogical-op

     

       214
       214
       -
       -else

     

       215
       215
       -
       -LOGICAL_OP_WARNING=

     

       216
       216
       -
       -endif

     

       217
       217
       -
       -

     

       218
       218
       -
       -if HAVE_DUPLICATED_COND_WARNING

     

       219
       219
       -
       -DUPLICATED_COND_WARNING=-Wduplicated-cond

     

       220
       220
       -
       -else

     

       221
       221
       -
       -DUPLICATED_COND_WARNING=

     

       222
       222
       -
       -endif

     

       223
       223
       -
       -

     

       224
       224
       -
       -if HAVE_NULL_DEREFERENCE_WARNING

     

       225
       225
       -
       -NULL_DEREFERENCE_WARNING=-Wnull-dereference

     

       226
       226
       -
       -else

     

       227
       227
       -
       -NULL_DEREFERENCE_WARNING=

     

       228
       228
       -
       -endif

     

       229
       229
       -
       -

     

       230
       230
       -
       -if HAVE_IMPLICIT_FALLTHROUGH_WARNING

     

       231
       231
       -
       -# Use strict fallthrough. Only __attribute__((fallthrough)) will prevent the

     

       232
       232
       -
       -# warning

     

       233
       233
       -
       -if HAVE_IMPLICIT_FALLTHROUGH_5_WARNING

     

       234
       234
       -
       -IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough=5

     

       235
       235
       -
       -else

     

       236
       236
       -
       -IMPLICIT_FALLTHROUGH_WARNING=-Wimplicit-fallthrough

     

       237
       237
       -
       -endif

     

       238
       238
       -
       -else

     

       239
       239
       -
       -IMPLICIT_FALLTHROUGH_WARNING=

     

       240
       240
       -
       -endif

     

       241
       241
       -
       -

     

       242
       242
       -
       -if HAVE_TRAMPOLINES_WARNING

     

       243
       243
       -
       -TRAMPOLINES_WARNING=-Wtrampolines

     

       244
       244
       -
       -else

     

       245
       245
       -
       -TRAMPOLINES_WARNING=

     

       246
       246
       -
       -endif

     

       247
       247
       -
       -

     

       248
       248
       -
       -if HAVE_NO_PACKED_NOT_ALIGNED_WARNING

     

       249
       249
       -
       -NO_PACKED_NOT_ALIGNED_WARNING=-Wno-packed-not-aligned

     

       250
       250
       -
       -else

     

       251
       251
       -
       -NO_PACKED_NOT_ALIGNED_WARNING=

     

       252
       252
       -
       -endif

     

       253
       253
       -
       -

     

       254
       254
       -
       -if HAVE_USE_AFTER_FREE3_WARNING

     

       255
       255
       -
       -USE_AFTER_FREE3_WARNING=-Wuse-after-free=3

     

       256
       256
       -
       -else

     

       257
       257
       -
       -USE_AFTER_FREE3_WARNING=

     

       258
       258
       -
       -endif

     

       259
       259
       -
       -

     

       260
       260
       -
       -AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \

     

       261
       261
       -
       -	    -Wold-style-definition -Wstrict-prototypes $(TRAMPOLINES_WARNING) \

     

       262
       262
       -
       -	    $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \

     

       263
       263
       -
       -	    $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \

     

       264
       264
       -
       -	    $(USE_AFTER_FREE3_WARNING) \

     

       265
       265
       -
       -	    $(if $($(*F)_no_Werror),,-Werror) \

     

       266
       266
       -
       -	    $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \

     

       267
       267
       -
       -	    $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \

     

       268
       268
       -
       -	    $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \

     

       269
       269
       -
       -	    $($(*F)_CFLAGS)

     

       270
       270
       -
       -

     

       271
       271
       -
       -AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \

     

       272
       272
       -
       -	   $(TRAMPOLINES_WARNING) \

     

       273
       273
       -
       -	   $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \

     

       274
       274
       -
       -	   $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \

     

       275
       275
       -
       -	   $(if $($(*F)_no_Werror),,-Werror) \

     

       276
       276
       -
       -	   $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \

     

       277
       277
       -
       -	   $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \

     

       278
       278
       -
       -	   $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \

     

       279
       279
       -
       -	   $($(*F)_CXXFLAGS)

     

       280
       280
       -
       -

     

       281
       281
       -
       -COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))

     

       282
       282
       -
       -

     

       283
       283
       -
       -DEFS.os = -DPIC -DSHARED

     

       284
       284
       -
       -if SYMBOL_VERSIONING

     

       285
       285
       -
       -DEFS.os += -DSYMBOL_VERSIONING

     

       286
       286
       -
       -else

     

       287
       287
       -
       -endif

     

       288
       288
       -
       -

     

       289
       289
       -
       -%.os: %.c %.o

     

       290
       290
       -
       -if AMDEP

     

       291
       291
       -
       -	$(AM_V_CC)if $(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) -MT $@ -MD -MP \

     

       292
       292
       -
       -	  -MF "$(DEPDIR)/$*.Tpo" `test -f '$<' || echo '$(srcdir)/'`$<; \

     

       293
       293
       -
       -	then cat "$(DEPDIR)/$*.Tpo" >> "$(DEPDIR)/$*.Po"; \

     

       294
       294
       -
       -	     rm -f "$(DEPDIR)/$*.Tpo"; \

     

       295
       295
       -
       -	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \

     

       296
       296
       -
       -	fi

     

       297
       297
       -
       -else

     

       298
       298
       -
       -	$(AM_V_CC)$(COMPILE.os) -c -o $@ $(fpic_CFLAGS) $(DEFS.os) $<

     

       299
       299
       -
       -endif

     

       300
       300
       -
       -

     

       301
       301
       -
       -CLEANFILES = *.gcno *.gcda

     

       302
       302
       -
       -

     

       303
       303
       -
       -textrel_msg = echo "WARNING: TEXTREL found in '$@'"

     

       304
       304
       -
       -if FATAL_TEXTREL

     

       305
       305
       -
       -textrel_found = $(textrel_msg); exit 1

     

       306
       306
       -
       -else

     

       307
       307
       -
       -textrel_found = $(textrel_msg)

     

       308
       308
       -
       -endif

     

       309
       309
       -
       -textrel_check = if $(READELF) -d $@ | grep -F -q TEXTREL; then $(textrel_found); fi

     

       310
       310
       -
       -

     

       311
       311
       -
       -print-%:

     

       312
       312
       -
       -	@echo $*=$($*)

     

       313
       313
       -
       +AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_srcdir)/lib -I..

     

       314
       314
       -
       +include $(top_srcdir)/config/eu-common.am

     

       315
       315
       -
       diff --git a/src/Makefile.am b/src/Makefile.am

     

       316
       316
       -
       index 97a0c61a..5bb8c078 100644

     

       317
       317
       -
       --- a/src/Makefile.am

     

       318
       318
       -
       +++ b/src/Makefile.am

     

       319
       319
       -
       @@ -16,14 +16,15 @@

     

       320
       320
       -
        ## You should have received a copy of the GNU General Public License

     

       321
       321
       -
        ## along with this program.  If not, see <http://www.gnu.org/licenses/>.

     

       322
       322
       -
        ##

     

       323
       323
       -
       -include $(top_srcdir)/config/eu.am

     

       324
       324
       -
       +include $(top_srcdir)/config/eu-common.am

     

       325
       325
       -
        DEFS += $(YYDEBUG) -DDEBUGPRED=@DEBUGPRED@ \

     

       326
       326
       -
        	-DSRCDIR=\"$(shell cd $(srcdir);pwd)\" -DOBJDIR=\"$(shell pwd)\"

     

       327
       327
       -
        

     

       328
       328
       -
       -DEFAULT_INCLUDES =

     

       329
       329
       -
       -AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \

     

       330
       330
       -
       -	    -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \

     

       331
       331
       -
       -	    -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm -I../debuginfod

     

       332
       332
       -
       +DEFAULT_INCLUDES = -I$(top_builddir)

     

       333
       333
       -
       +AM_CPPFLAGS = -I$(top_srcdir)/lib -I.. \

     

       334
       334
       -
       +	    -I$(srcdir)/../libelf -I$(srcdir)/../libebl \

     

       335
       335
       -
       + 	    -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf \

     

       336
       336
       -
       + 	    -I$(srcdir)/../libdwfl -I$(srcdir)/../libasm -I../debuginfod

     

       337
       337
       -
        

     

       338
       338
       -
        AM_LDFLAGS = -Wl,-rpath-link,../libelf:../libdw $(STACK_USAGE_NO_ERROR)

+51 -54

pkgs/by-name/el/elfutils/package.nix

···

       23
       23
        
         libmicrohttpd,

     

       24
       24
        
         libarchive,

     

       25
       25
        
         gitUpdater,

     

       26
       26
       -
         autoreconfHook,

     

       27
       26
        
       }:

     

       28
       27
        
       

     

       29
       28
        
       # TODO: Look at the hardcoded paths to kernel, modules etc.

     
···

       36
       35
        
           hash = "sha256-eFf0S2JPTY1CHfhRqq57FALP5rzdLYBJ8V/AfT3edjU=";

     

       37
       36
        
         };

     

       38
       37
        
       

     

       39
       39
       -
         patches =

     

       40
       40
       -
           [

     

       41
       41
       -
             ./debug-info-from-env.patch

     

       42
       42
       -
             (fetchpatch {

     

       43
       43
       -
               name = "fix-aarch64_fregs.patch";

     

       44
       44
       -
               url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

     

       45
       45
       -
               sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs=";

     

       46
       46
       -
             })

     

       47
       47
       -
             (fetchpatch {

     

       48
       48
       -
               name = "musl-asm-ptrace-h.patch";

     

       49
       49
       -
               url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

     

       50
       50
       -
               sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k=";

     

       51
       51
       -
             })

     

       52
       52
       -
             (fetchpatch {

     

       53
       53
       -
               name = "musl-macros.patch";

     

       54
       54
       -
               url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

     

       55
       55
       -
               sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8=";

     

       56
       56
       -
             })

     

       57
       57
       -
             (fetchpatch {

     

       58
       58
       -
               name = "musl-strndupa.patch";

     

       59
       59
       -
               url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

     

       60
       60
       -
               sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";

     

       61
       61
       -
             })

     

       62
       62
       -
           ]

     

       63
       63
       -
           ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]

     

       64
       64
       -
           # Prevent headers and binaries from colliding which results in an error.

     

       65
       65
       -
           # https://sourceware.org/pipermail/elfutils-devel/2024q3/007281.html

     

       66
       66
       -
           ++ lib.optional (stdenv.targetPlatform.useLLVM or false) ./cxx-header-collision.patch;

     

       38
       38
       +
         patches = [

     

       39
       39
       +
           ./debug-info-from-env.patch

     

       40
       40
       +
           (fetchpatch {

     

       41
       41
       +
             name = "fix-aarch64_fregs.patch";

     

       42
       42
       +
             url = "https://git.alpinelinux.org/aports/plain/main/elfutils/fix-aarch64_fregs.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

     

       43
       43
       +
             sha256 = "zvncoRkQx3AwPx52ehjA2vcFroF+yDC2MQR5uS6DATs=";

     

       44
       44
       +
           })

     

       45
       45
       +
           (fetchpatch {

     

       46
       46
       +
             name = "musl-asm-ptrace-h.patch";

     

       47
       47
       +
             url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-asm-ptrace-h.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

     

       48
       48
       +
             sha256 = "8D1wPcdgAkE/TNBOgsHaeTZYhd9l+9TrZg8d5C7kG6k=";

     

       49
       49
       +
           })

     

       50
       50
       +
           (fetchpatch {

     

       51
       51
       +
             name = "musl-macros.patch";

     

       52
       52
       +
             url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-macros.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

     

       53
       53
       +
             sha256 = "tp6O1TRsTAMsFe8vw3LMENT/vAu6OmyA8+pzgThHeA8=";

     

       54
       54
       +
           })

     

       55
       55
       +
           (fetchpatch {

     

       56
       56
       +
             name = "musl-strndupa.patch";

     

       57
       57
       +
             url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9";

     

       58
       58
       +
             sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0=";

     

       59
       59
       +
           })

     

       60
       60
       +
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ];

     

       67
       61
        
       

     

       68
       62
        
         postPatch =

     

       69
       63
        
           ''

     
···

       85
       79
        
       

     

       86
       80
        
         # We need bzip2 in NativeInputs because otherwise we can't unpack the src,

     

       87
       81
        
         # as the host-bzip2 will be in the path.

     

       88
       88
       -
         nativeBuildInputs =

     

       89
       89
       -
           [

     

       90
       90
       -
             m4

     

       91
       91
       -
             bison

     

       92
       92
       -
             flex

     

       93
       93
       -
             gettext

     

       94
       94
       -
             bzip2

     

       95
       95
       -
           ]

     

       96
       96
       -
           ++ lib.optional enableDebuginfod pkg-config

     

       97
       97
       -
           ++ lib.optional (stdenv.targetPlatform.useLLVM or false) autoreconfHook;

     

       82
       82
       +
         nativeBuildInputs = [

     

       83
       83
       +
           m4

     

       84
       84
       +
           bison

     

       85
       85
       +
           flex

     

       86
       86
       +
           gettext

     

       87
       87
       +
           bzip2

     

       88
       88
       +
         ] ++ lib.optional enableDebuginfod pkg-config;

     

       98
       89
        
         buildInputs =

     

       99
       90
        
           [

     

       100
       91
        
             zlib

     
···

       119
       110
        
       

     

       120
       111
        
         hardeningDisable = [ "strictflexarrays3" ];

     

       121
       112
        
       

     

       122
       122
       -
         configureFlags =

     

       123
       123
       -
           [

     

       124
       124
       -
             "--program-prefix=eu-" # prevent collisions with binutils

     

       125
       125
       -
             "--enable-deterministic-archives"

     

       126
       126
       -
             (lib.enableFeature enableDebuginfod "libdebuginfod")

     

       127
       127
       -
             (lib.enableFeature enableDebuginfod "debuginfod")

     

       113
       113
       +
         # build elfutils out-of-source-tree to avoid ./stack inclusion

     

       114
       114
       +
         # as a c++ header on libc++: https://sourceware.org/PR33103

     

       115
       115
       +
         preConfigure =

     

       116
       116
       +
           if (stdenv.targetPlatform.useLLVM or false) then

     

       117
       117
       +
             ''

     

       118
       118
       +
               mkdir build-tree

     

       119
       119
       +
               cd build-tree

     

       120
       120
       +
             ''

     

       121
       121
       +
           else

     

       122
       122
       +
             null;

     

       123
       123
       +
         configureScript = if (stdenv.targetPlatform.useLLVM or false) then "../configure" else null;

     

       128
       124
        
       

     

       129
       129
       -
             # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766

     

       130
       130
       -
             # Versioned symbols are nice to have, but we can do without.

     

       131
       131
       -
             (lib.enableFeature (!stdenv.hostPlatform.isMicroBlaze) "symbol-versioning")

     

       132
       132
       -
           ]

     

       133
       133
       -
           ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "--disable-demangler"

     

       134
       134
       -
           ++ lib.optionals stdenv.cc.isClang [

     

       135
       135
       -
             "CFLAGS=-Wno-unused-private-field"

     

       136
       136
       -
             "CXXFLAGS=-Wno-unused-private-field"

     

       137
       137
       -
           ];

     

       125
       125
       +
         configureFlags = [

     

       126
       126
       +
           "--program-prefix=eu-" # prevent collisions with binutils

     

       127
       127
       +
           "--enable-deterministic-archives"

     

       128
       128
       +
           (lib.enableFeature enableDebuginfod "libdebuginfod")

     

       129
       129
       +
           (lib.enableFeature enableDebuginfod "debuginfod")

     

       130
       130
       +
       

     

       131
       131
       +
           # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101766

     

       132
       132
       +
           # Versioned symbols are nice to have, but we can do without.

     

       133
       133
       +
           (lib.enableFeature (!stdenv.hostPlatform.isMicroBlaze) "symbol-versioning")

     

       134
       134
       +
         ] ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "--disable-demangler";

     

       138
       135
        
       

     

       139
       136
        
         enableParallelBuilding = true;

     

       140
       137