commit ba1b15be08b15e1b8368fb0e7a392b4fc7c88697 · pyrox.dev/nixpkgs

+20

pkgs/development/compilers/squeak/cc-no-export-dynamic.patch

···

       1
       1
       +
       diff --git a/platforms/unix/config/make.prg.in b/platforms/unix/config/make.prg.in

     

       2
       2
       +
       index 96a64a1..05f6114 100644

     

       3
       3
       +
       --- a/platforms/unix/config/make.prg.in

     

       4
       4
       +
       +++ b/platforms/unix/config/make.prg.in

     

       5
       5
       +
       @@ -8,13 +8,13 @@ o		= .o

     

       6
       6
       +
        a		= .a

     

       7
       7
       +
        x		=

     

       8
       8
       +
        COMPILE		= $(CC) $(CFLAGS) $(CPPFLAGS) $(XCFLAGS) \

     

       9
       9
       +
       -		  $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -c -o

     

       10
       10
       +
       +		  $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -c -o

     

       11
       11
       +
        COMPILEIFP	= $(CC) $(CFLAGS) $(XCFLAGS) \

     

       12
       12
       +
        		  $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -fno-omit-frame-pointer -c -o

     

       13
       13
       +
        CXXFLAGS	= $(CFLAGS) # Hack; can't be bothered to add CXXFLAGS to the configure mess

     

       14
       14
       +
        COMPILE.cpp = $(COMPILE.cc)

     

       15
       15
       +
        COMPILE.cc	= $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(XCFLAGS) \

     

       16
       16
       +
       -		  $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -c -o

     

       17
       17
       +
       +		  $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -c -o

     

       18
       18
       +
        LINK		= $(LIBTOOL) --mode=link \

     

       19
       19
       +
        		  $(CC) $(CFLAGS) $(XCFLAGS) \

     

       20
       20
       +
        		  $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -o

pkgs/development/compilers/squeak/default.nix

···

       135
       135
        
           ./squeak-configure-version.patch

     

       136
       136
        
           ./squeak-plugins-discovery.patch

     

       137
       137
        
           ./squeak-squeaksh-nixpkgs.patch

     

       138
       138
       +
           # it looks like -export-dynamic is being passed erroneously to the compiler,

     

       139
       139
       +
           # as it is a linker flag and at this step the build is just compiling notice the -c flag.

     

       140
       140
       +
           ./cc-no-export-dynamic.patch

     

       138
       141
        
         ];

     

       139
       142
        
       

     

       140
       143
        
         postPatch = ''