View | Details | Raw Unified | Return to bug 259896 | Differences between
and this patch

Collapse All | Expand All

(-)b/lang/python310/Makefile (-3 / +2 lines)
Lines 2-8 Link Here
2 

          2
          

        

        

          3
          
PORTNAME=	python

          3
          
PORTNAME=	python

        

        

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

        

          
            

              5
              
PORTREVISION=	1


              5
              
PORTREVISION=	2

            

        

          6
          
CATEGORIES=	lang python

          6
          
CATEGORIES=	lang python

        

        

          7
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}

          7
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION:C/[a-z].*//}

        

        

          8
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

          8
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

        

  

    
      
            Lines 127-134
          post-patch:
      
      
        Link Here
      
    
  

        

          127
          
	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py

          127
          
	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py

        

        

          128
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

          128
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

        

        

          129
          
# major.minor version number in -print-multiarch output, confusing Python

          129
          
# major.minor version number in -print-multiarch output, confusing Python

        

          
            

              130
              
	@${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \


              130
              
	@${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure

            

            

              131
              
		${WRKSRC}/configure.ac


              
              
            

        

          132
          
# Apply DISABLED_EXTENSIONS

          131
          
# Apply DISABLED_EXTENSIONS

        

        

          133
          
	@${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local

          132
          
	@${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local

        

        

          134
          
.  for _module in ${DISABLED_EXTENSIONS}

          133
          
.  for _module in ${DISABLED_EXTENSIONS}

        



(-)b/lang/python36/Makefile
      (-3 / +2 lines)




  

    
      
            Lines 2-8
          
      
      
        Link Here
      
    
  

        

          2
          

          2
          

        

        

          3
          
PORTNAME=	python

          3
          
PORTNAME=	python

        

        

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

        

          
            

              5
              
PORTREVISION=	1


              5
              
PORTREVISION=	2

            

        

          6
          
CATEGORIES=	lang python

          6
          
CATEGORIES=	lang python

        

        

          7
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}

          7
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}

        

        

          8
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

          8
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

        

  

    
      
            Lines 128-135
          PLIST_SUB+=	NO_NIS=""
      
      
        Link Here
      
    
  

        

          128
          
post-patch:

          128
          
post-patch:

        

        

          129
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

          129
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

        

        

          130
          
# major.minor version number in -print-multiarch output, confusing Python

          130
          
# major.minor version number in -print-multiarch output, confusing Python

        

          
            

              131
              
	@${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \


              131
              
	@${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure

            

            

              132
              
		${WRKSRC}/configure.ac


              
              
            

        

          133
          

          132
          

        

        

          134
          
post-install:

          133
          
post-install:

        

        

          135
          
.if ! ${PORT_OPTIONS:MDEBUG}

          134
          
.if ! ${PORT_OPTIONS:MDEBUG}

        



(-)b/lang/python37/Makefile
      (-3 / +2 lines)




  

    
      
            Lines 2-8
          
      
      
        Link Here
      
    
  

        

          2
          

          2
          

        

        

          3
          
PORTNAME=	python

          3
          
PORTNAME=	python

        

        

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

        

          
            

              5
              
PORTREVISION=	1


              5
              
PORTREVISION=	2

            

        

          6
          
CATEGORIES=	lang python

          6
          
CATEGORIES=	lang python

        

        

          7
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}

          7
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}

        

        

          8
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

          8
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

        

  

    
      
            Lines 114-121
          post-patch:
      
      
        Link Here
      
    
  

        

          114
          
	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py

          114
          
	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py

        

        

          115
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

          115
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

        

        

          116
          
# major.minor version number in -print-multiarch output, confusing Python

          116
          
# major.minor version number in -print-multiarch output, confusing Python

        

          
            

              117
              
	@${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \


              117
              
	@${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure

            

            

              118
              
		${WRKSRC}/configure.ac


              
              
            

        

          119
          
# Apply DISABLED_EXTENSIONS

          118
          
# Apply DISABLED_EXTENSIONS

        

        

          120
          
	@${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local

          119
          
	@${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local

        

        

          121
          
.  for _module in ${DISABLED_EXTENSIONS}

          120
          
.  for _module in ${DISABLED_EXTENSIONS}

        



(-)b/lang/python38/Makefile
      (-3 / +2 lines)




  

    
      
            Lines 2-8
          
      
      
        Link Here
      
    
  

        

          2
          

          2
          

        

        

          3
          
PORTNAME=	python

          3
          
PORTNAME=	python

        

        

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

        

          
            

              5
              
PORTREVISION=	1


              5
              
PORTREVISION=	2

            

        

          6
          
CATEGORIES=	lang python

          6
          
CATEGORIES=	lang python

        

        

          7
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}

          7
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}

        

        

          8
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

          8
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

        

  

    
      
            Lines 118-125
          post-patch:
      
      
        Link Here
      
    
  

        

          118
          
	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py

          118
          
	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py

        

        

          119
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

          119
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

        

        

          120
          
# major.minor version number in -print-multiarch output, confusing Python

          120
          
# major.minor version number in -print-multiarch output, confusing Python

        

          
            

              121
              
	@${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \


              121
              
	@${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure

            

            

              122
              
		${WRKSRC}/configure.ac


              
              
            

        

          123
          
# Apply DISABLED_EXTENSIONS

          122
          
# Apply DISABLED_EXTENSIONS

        

        

          124
          
	@${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local

          123
          
	@${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local

        

        

          125
          
.  for _module in ${DISABLED_EXTENSIONS}

          124
          
.  for _module in ${DISABLED_EXTENSIONS}

        



(-)b/lang/python39/Makefile
      (-2 / +2 lines)




  

    
      
            Lines 2-7
          
      
      
        Link Here
      
    
  

        

          2
          

          2
          

        

        

          3
          
PORTNAME=	python

          3
          
PORTNAME=	python

        

        

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

          4
          
DISTVERSION=	${PYTHON_DISTVERSION}

        

            

              
              
              5
              
PORTREVISION=	1

            

        

          5
          
CATEGORIES=	lang python

          6
          
CATEGORIES=	lang python

        

        

          6
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}

          7
          
MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}

        

        

          7
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

          8
          
PKGNAMESUFFIX=	${PYTHON_SUFFIX}

        

  

    
      
            Lines 118-125
          post-patch:
      
      
        Link Here
      
    
  

        

          118
          
	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py

          119
          
	@${REINPLACE_CMD} -e '/find_library_file/ s|uuid|ignore_&|' ${WRKSRC}/setup.py

        

        

          119
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

          120
          
# disable detection of multiarch as it breaks with clang >= 13, which adds a

        

        

          120
          
# major.minor version number in -print-multiarch output, confusing Python

          121
          
# major.minor version number in -print-multiarch output, confusing Python

        

          
            

              121
              
	@${REINPLACE_CMD} -e 's|^MULTIARCH=.*|MULTIARCH=|' ${WRKSRC}/configure \


              122
              
	@${REINPLACE_CMD} -e 's|^\( *MULTIARCH=\).*--print-multiarch.*|\1|' ${WRKSRC}/configure

            

            

              122
              
		${WRKSRC}/configure.ac


              
              
            

        

          123
          
# Apply DISABLED_EXTENSIONS

          123
          
# Apply DISABLED_EXTENSIONS

        

        

          124
          
	@${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local

          124
          
	@${ECHO_CMD} '*disabled*' > ${WRKSRC}/Modules/Setup.local

        

        

          125
          
.  for _module in ${DISABLED_EXTENSIONS}

          125
          
.  for _module in ${DISABLED_EXTENSIONS}

        






  

  Return to bug 259896