commit 10a5379763d2137cdbeea1a1bcbebba4594c113a · pyrox.dev/nixpkgs

+39

pkgs/development/compilers/gcc/patches/14/gcc-darwin-remove-coreservices.patch

···

       1
       1
       +
       diff --git a/config/intlmacosx.m4 b/config/intlmacosx.m4

     

       2
       2
       +
       index 3141bf8c5..7a31862b9 100644

     

       3
       3
       +
       --- a/config/intlmacosx.m4

     

       4
       4
       +
       +++ b/config/intlmacosx.m4

     

       5
       5
       +
       @@ -63,7 +63,7 @@ AC_DEFUN([gt_INTL_MACOSX],

     

       6
       6
       +
            dnl and we have to link it in explicitly, otherwise an exception

     

       7
       7
       +
            dnl NSInvalidArgumentException "unrecognized selector sent to instance"

     

       8
       8
       +
            dnl occurs.

     

       9
       9
       +
       -    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"

     

       10
       10
       +
       +    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"

     

       11
       11
       +
          fi

     

       12
       12
       +
          AC_SUBST([INTL_MACOSX_LIBS])

     

       13
       13
       +
        ])

     

       14
       14
       +
       diff --git a/gcc/configure b/gcc/configure

     

       15
       15
       +
       index 23da7d55d..8bd09364d 100755

     

       16
       16
       +
       --- a/gcc/configure

     

       17
       17
       +
       +++ b/gcc/configure

     

       18
       18
       +
       @@ -13932,7 +13932,7 @@ $as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h

     

       19
       19
       +
          INTL_MACOSX_LIBS=

     

       20
       20
       +
          if test $gt_cv_func_CFPreferencesCopyAppValue = yes \

     

       21
       21
       +
             || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then

     

       22
       22
       +
       -                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"

     

       23
       23
       +
       +                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"

     

       24
       24
       +
          fi

     

       25
       25
       +
        

     

       26
       26
       +
        

     

       27
       27
       +
       diff --git a/libcpp/configure b/libcpp/configure

     

       28
       28
       +
       index 32d6aaa30..592c33881 100755

     

       29
       29
       +
       --- a/libcpp/configure

     

       30
       30
       +
       +++ b/libcpp/configure

     

       31
       31
       +
       @@ -7570,7 +7570,7 @@ $as_echo "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h

     

       32
       32
       +
          INTL_MACOSX_LIBS=

     

       33
       33
       +
          if test $gt_cv_func_CFPreferencesCopyAppValue = yes \

     

       34
       34
       +
             || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then

     

       35
       35
       +
       -                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"

     

       36
       36
       +
       +                    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"

     

       37
       37
       +
          fi

     

       38
       38
       +
        

     

       39
       39
       +

+21

pkgs/development/compilers/gcc/patches/14/gnat-darwin-dylib-install-name-14.patch

···

       1
       1
       +
       diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in

     

       2
       2
       +
       index 0666fc00b..0e2d53eb8 100644

     

       3
       3
       +
       --- a/gcc/ada/gcc-interface/Makefile.in

     

       4
       4
       +
       +++ b/gcc/ada/gcc-interface/Makefile.in

     

       5
       5
       +
       @@ -793,14 +793,14 @@ gnatlib-shared-darwin:

     

       6
       6
       +
        		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

     

       7
       7
       +
        		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \

     

       8
       8
       +
        		$(SO_OPTS) \

     

       9
       9
       +
       -		-Wl,-install_name,@rpath/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

     

       10
       10
       +
       +		-Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \

     

       11
       11
       +
        		-nodefaultrpaths -Wl,-rpath,@loader_path/,-rpath,@loader_path/.. \

     

       12
       12
       +
        		-Wl,-rpath,@loader_path/../../../../ $(MISCLIB)

     

       13
       13
       +
        	cd $(RTSDIR); $(GCC_FOR_ADA_RTS) -dynamiclib $(PICFLAG_FOR_TARGET) \

     

       14
       14
       +
        		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

     

       15
       15
       +
        		$(GNATRTL_TASKING_OBJS) \

     

       16
       16
       +
        		$(SO_OPTS) \

     

       17
       17
       +
       -		-Wl,-install_name,@rpath/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

     

       18
       18
       +
       +		-Wl,-install_name,$(ADA_RTL_DSO_DIR)/libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \

     

       19
       19
       +
        		-nodefaultrpaths -Wl,-rpath,@loader_path/,-rpath,@loader_path/.. \

     

       20
       20
       +
        		-Wl,-rpath,@loader_path/../../../../ \

     

       21
       21
       +
        		$(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext)

pkgs/development/compilers/gcc/patches/default.nix

···

       133
       133
        
       # Fix detection of bootstrap compiler Ada support (cctools as) on Nix Darwin

     

       134
       134
        
       ++ optional (atLeast12 && stdenv.isDarwin && langAda) ./ada-cctools-as-detection-configure.patch

     

       135
       135
        
       

     

       136
       136
       +
       # Remove CoreServices on Darwin, as it is only needed for macOS SDK 14+

     

       137
       137
       +
       ++ optional (atLeast14 && stdenv.isDarwin && langAda) ../patches/14/gcc-darwin-remove-coreservices.patch

     

       138
       138
       +
       

     

       136
       139
        
       # Use absolute path in GNAT dylib install names on Darwin

     

       137
       140
        
       ++ optionals (stdenv.isDarwin && langAda) ({

     

       141
       141
       +
         "14" = [ ../patches/14/gnat-darwin-dylib-install-name-14.patch ];

     

       138
       142
        
         "13" = [ ./gnat-darwin-dylib-install-name-13.patch ];

     

       139
       143
        
         "12" = [ ./gnat-darwin-dylib-install-name.patch ];

     

       140
       144
        
       }.${majorVersion} or [])