IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 42141


Ignore:
Timestamp:
Mar 23, 2022, 1:21:41 PM (4 years ago)
Author:
eugene
Message:

add linker option -Wl,--allow-multiple-definition to support gcc >= 11

Location:
branches/eam_branches/ipp-20220316/Ohana
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20220316/Ohana/Makefile.Common

    r41492 r42141  
    8484        @echo ""
    8585
     86# USE THIS? -Wl,--allow-multiple-definition
     87
    8688$(LIB)/%.$(ARCH).so:
    8789        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
    8890        rm -f $@
    89         gcc -shared -Wl,-soname,$*.so -o $@ $^ -lc
     91#       gcc -shared -Wl,-soname,$*.so -o $@ $^ -lc
     92        gcc -shared -Wl,-soname,$*.so -o $@ $^ -lc -Wl,--allow-multiple-definition
    9093        @echo "compiled shared library $*"
    9194        @echo ""

  • branches/eam_branches/ipp-20220316/Ohana/Makefile.System.in

    r12842 r42141  
    1717CFLAGS   = @CFLAGS@
    1818CPPFLAGS = @CPPFLAGS@
    19 LDFLAGS  = @LDFLAGS@
     19LDFLAGS  = @LDFLAGS@ -Wl,--allow-multiple-definition
    2020DLLTYPE  = @DLLTYPE@
    2121

  • branches/eam_branches/ipp-20220316/Ohana/src/libdvo/include/dvodb.h

    r42075 r42141  
    150150
    151151/* measure fields */
    152 enum {MEAS_ZERO,
     152typedef enum {MEAS_ZERO,
    153153      MEAS_GLON,
    154154      MEAS_GLAT,
    … …  
    312312
    313313/* average fields */
    314 enum {AVE_ZERO,
     314typedef enum {AVE_ZERO,
    315315      AVE_RA,
    316316      AVE_DEC,
    … …  
    376376//       AVE_Xm,
    377377
    378 enum {IMAGE_ZERO,
     378typedef enum {IMAGE_ZERO,
    379379      IMAGE_RA,
    380380      IMAGE_DEC,

  • branches/eam_branches/ipp-20220316/Ohana/src/opihi/Makefile.Common

    r13615 r42141  
    4242        @if [ ! -d $(LIB) ]; then mkdir -p $(LIB); fi
    4343        rm -f $@
    44         gcc -shared -Wl,-soname,$*.so -o $@ $^ -lc
     44#       gcc -shared -Wl,-soname,$*.so -o $@ $^ -lc
     45        gcc -shared -Wl,-soname,$*.so -o $@ $^ -lc -Wl,--allow-multiple-definition
    4546
    4647$(DESTLIB)/%.so: $(LIB)/%.$(ARCH).so
Note: See TracChangeset for help on using the changeset viewer.