Re: [fix] cad/oce: unreplaced variable on cmake files
Committed, thanks.
Re: [fix] cad/oce: unreplaced variable on cmake files
> Committed, thanks. Awesome, thanks!
Re: [fix] cad/oce: unreplaced variable on cmake files
Klemens Nanni wrote:
> On Sun, Sep 03, 2023 at 04:32:24PM +0200, Johannes Thyssen Tishman wrote:
> > *ping*
> >
> > Aug 31, 2023 22:58:50 Johannes Thyssen Tishman :
>
> You can usually give it a week before pinging, four days is a little hasty,
> especially since oce is a monster C++ ports (~5600 files to compile), i.e.
> nothing you'd quickly (re)build and test.
Good to know, thanks. Never really know when is a good time to ping
and I was afraid it would come off a little pushy, I'm sorry. The
list has been quite active lately and I didn't want this patch to
get lost. My bad.
> The patched .cmake file stlil looks ugly, but should work.
Indeed. The cmake script is ugly as is IMO. Took me forever to debug.
> My machine is still churning along, I'll take care of the fix once confirmed.
Thanks a lot.
> Thanks.
>
> >
> > > Hi,
> > >
> > > The following cmake files installed by cad/oce contain a variable
> > > (${OCCT_INSTALL_BIN_LETTER}) that should've been replaced during
> > > installation:
> > >
> > > /usr/local/lib/cmake/opencascade/OpenCASCADEApplicationFrameworkTargets-release.cmake
> > > /usr/local/lib/cmake/opencascade/OpenCASCADEDataExchangeTargets-release.cmake
> > > /usr/local/lib/cmake/opencascade/OpenCASCADEDrawTargets-release.cmake
> > > /usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets-release.cmake
> > > /usr/local/lib/cmake/opencascade/OpenCASCADEModelingAlgorithmsTargets-release.cmake
> > > /usr/local/lib/cmake/opencascade/OpenCASCADEModelingDataTargets-release.cmake
> > > /usr/local/lib/cmake/opencascade/OpenCASCADEVisualizationTargets-release.cmake
> > >
> > > To verify, run the following. You'll notice how the variable is
> > > escaped (\${...}):
> > >
> > > # pkg_add oce
> > > $ grep OCCT_INSTALL_BIN_LETTER
> > > /usr/local/lib/cmake/opencascade/OpenCASCADE*
> > >
> > > I'm working on porting FreeCAD (which depends on oce)
> > > and I'm getting the following error during the configuration stage:
> > >
> > >> CMake Error at
> > >> /usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets.cmake:87
> > >> (message):
> > >> The imported target "TKernel" references the file
> > >>
> > >> "/usr/local/lib${OCCT_INSTALL_BIN_LETTER}/libTKernel.so.1.0"
> > >>
> > >> but this file does not exist. Possible reasons include:
> > >>
> > >> * The file was deleted, renamed, or moved to another location.
> > >>
> > >> * An install or uninstall procedure did not complete successfully.
> > >>
> > >> * The installation package was faulty and contained
> > >>
> > >>
> > >> "/usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets.cmake"
> > >>
> > >> but not all the files it references.
> > >
> > > The diff below is based on a patch from the FreeBSD port and should
> > > fix this issue. The only consumer is cad/kicad and it built fine.
> > >
> > > Kind regards,
> > > Johannes
> > >
> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/cad/oce/Makefile,v
> > > retrieving revision 1.9
> > > diff -u -p -r1.9 Makefile
> > > --- Makefile 28 Feb 2023 21:22:28 - 1.9
> > > +++ Makefile 31 Aug 2023 19:47:51 -
> > > @@ -7,7 +7,7 @@ GH_ACCOUNT = tpaviot
> > > GH_PROJECT = oce
> > > GH_COMMIT = 98a788062f0f30593880b0df1bcf967408212ba4
> > > DISTNAME = oce-7.6.0
> > > -REVISION = 1
> > > +REVISION = 2
> > >
> > > .for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF
> > > TKCDF \
> > > TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR
> > > \
> > > Index: patches/patch-adm_cmake_occt_macros_cmake
> > > ===
> > > RCS file: /cvs/ports/cad/oce/patches/patch-adm_cmake_occt_macros_cmake,v
> > > retrieving revision 1.2
> > > diff -u -p -r1.2 patch-adm_cmake_occt_macros_cmake
> > > --- patches/patch-adm_cmake_occt_macros_cmake 11 Mar 2022 18:24:30
> > > - 1.2
> > > +++ patches/patch-adm_cmake_occt_macros_cmake 31 Aug 2023 19:47:51 -
> > > @@ -1,15 +1,12 @@
> > > -Ugly hack on ALL_OCCT_TARGET_FILES: change later
> > > -
> > > Index: adm/cmake/occt_macros.cmake
> > > --- adm/cmake/occt_macros.cmake.orig
> > > +++ adm/cmake/occt_macros.cmake
> > > -@@ -592,7 +592,8 @@ macro (OCCT_UPDATE_TARGET_FILE)
> > > +@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
> > > "cmake_policy(PUSH)
> > > cmake_policy(SET CMP0007 NEW)
> > > string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\"
> > > CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
> > > - file (GLOB ALL_OCCT_TARGET_FILES
> > > \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
> > > -+ file (GLOB ALL_OCCT_TARGET_FILES
> > > -+
> > > \"${PROJECT_BINARY_DIR}/CMakeFiles/Export/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
> > > ++ file (GLOB ALL_OCCT_TARGET_FILES
> > >
Re: [fix] cad/oce: unreplaced variable on cmake files
On Sun, Sep 03, 2023 at 04:32:24PM +0200, Johannes Thyssen Tishman wrote:
> *ping*
>
> Aug 31, 2023 22:58:50 Johannes Thyssen Tishman :
You can usually give it a week before pinging, four days is a little hasty,
especially since oce is a monster C++ ports (~5600 files to compile), i.e.
nothing you'd quickly (re)build and test.
The patched .cmake file stlil looks ugly, but should work.
My machine is still churning along, I'll take care of the fix once confirmed.
Thanks.
>
> > Hi,
> >
> > The following cmake files installed by cad/oce contain a variable
> > (${OCCT_INSTALL_BIN_LETTER}) that should've been replaced during
> > installation:
> >
> > /usr/local/lib/cmake/opencascade/OpenCASCADEApplicationFrameworkTargets-release.cmake
> > /usr/local/lib/cmake/opencascade/OpenCASCADEDataExchangeTargets-release.cmake
> > /usr/local/lib/cmake/opencascade/OpenCASCADEDrawTargets-release.cmake
> > /usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets-release.cmake
> > /usr/local/lib/cmake/opencascade/OpenCASCADEModelingAlgorithmsTargets-release.cmake
> > /usr/local/lib/cmake/opencascade/OpenCASCADEModelingDataTargets-release.cmake
> > /usr/local/lib/cmake/opencascade/OpenCASCADEVisualizationTargets-release.cmake
> >
> > To verify, run the following. You'll notice how the variable is
> > escaped (\${...}):
> >
> > # pkg_add oce
> > $ grep OCCT_INSTALL_BIN_LETTER /usr/local/lib/cmake/opencascade/OpenCASCADE*
> >
> > I'm working on porting FreeCAD (which depends on oce)
> > and I'm getting the following error during the configuration stage:
> >
> >> CMake Error at
> >> /usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets.cmake:87
> >> (message):
> >> The imported target "TKernel" references the file
> >>
> >> "/usr/local/lib${OCCT_INSTALL_BIN_LETTER}/libTKernel.so.1.0"
> >>
> >> but this file does not exist. Possible reasons include:
> >>
> >> * The file was deleted, renamed, or moved to another location.
> >>
> >> * An install or uninstall procedure did not complete successfully.
> >>
> >> * The installation package was faulty and contained
> >>
> >>
> >> "/usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets.cmake"
> >>
> >> but not all the files it references.
> >
> > The diff below is based on a patch from the FreeBSD port and should
> > fix this issue. The only consumer is cad/kicad and it built fine.
> >
> > Kind regards,
> > Johannes
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/cad/oce/Makefile,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 Makefile
> > --- Makefile 28 Feb 2023 21:22:28 - 1.9
> > +++ Makefile 31 Aug 2023 19:47:51 -
> > @@ -7,7 +7,7 @@ GH_ACCOUNT = tpaviot
> > GH_PROJECT = oce
> > GH_COMMIT = 98a788062f0f30593880b0df1bcf967408212ba4
> > DISTNAME = oce-7.6.0
> > -REVISION = 1
> > +REVISION = 2
> >
> > .for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF
> > \
> > TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR \
> > Index: patches/patch-adm_cmake_occt_macros_cmake
> > ===
> > RCS file: /cvs/ports/cad/oce/patches/patch-adm_cmake_occt_macros_cmake,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 patch-adm_cmake_occt_macros_cmake
> > --- patches/patch-adm_cmake_occt_macros_cmake 11 Mar 2022 18:24:30 -
> > 1.2
> > +++ patches/patch-adm_cmake_occt_macros_cmake 31 Aug 2023 19:47:51 -
> > @@ -1,15 +1,12 @@
> > -Ugly hack on ALL_OCCT_TARGET_FILES: change later
> > -
> > Index: adm/cmake/occt_macros.cmake
> > --- adm/cmake/occt_macros.cmake.orig
> > +++ adm/cmake/occt_macros.cmake
> > -@@ -592,7 +592,8 @@ macro (OCCT_UPDATE_TARGET_FILE)
> > +@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
> > "cmake_policy(PUSH)
> > cmake_policy(SET CMP0007 NEW)
> > string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\"
> > CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
> > - file (GLOB ALL_OCCT_TARGET_FILES
> > \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
> > -+ file (GLOB ALL_OCCT_TARGET_FILES
> > -+
> > \"${PROJECT_BINARY_DIR}/CMakeFiles/Export/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
> > ++ file (GLOB ALL_OCCT_TARGET_FILES
> > \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
> > foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
> > file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
> > file (REMOVE \"\${TARGET_FILENAME}\")
>
Re: [fix] cad/oce: unreplaced variable on cmake files
*ping*
Aug 31, 2023 22:58:50 Johannes Thyssen Tishman :
> Hi,
>
> The following cmake files installed by cad/oce contain a variable
> (${OCCT_INSTALL_BIN_LETTER}) that should've been replaced during
> installation:
>
> /usr/local/lib/cmake/opencascade/OpenCASCADEApplicationFrameworkTargets-release.cmake
> /usr/local/lib/cmake/opencascade/OpenCASCADEDataExchangeTargets-release.cmake
> /usr/local/lib/cmake/opencascade/OpenCASCADEDrawTargets-release.cmake
> /usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets-release.cmake
> /usr/local/lib/cmake/opencascade/OpenCASCADEModelingAlgorithmsTargets-release.cmake
> /usr/local/lib/cmake/opencascade/OpenCASCADEModelingDataTargets-release.cmake
> /usr/local/lib/cmake/opencascade/OpenCASCADEVisualizationTargets-release.cmake
>
> To verify, run the following. You'll notice how the variable is
> escaped (\${...}):
>
> # pkg_add oce
> $ grep OCCT_INSTALL_BIN_LETTER /usr/local/lib/cmake/opencascade/OpenCASCADE*
>
> I'm working on porting FreeCAD (which depends on oce)
> and I'm getting the following error during the configuration stage:
>
>> CMake Error at
>> /usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets.cmake:87
>> (message):
>> The imported target "TKernel" references the file
>>
>> "/usr/local/lib${OCCT_INSTALL_BIN_LETTER}/libTKernel.so.1.0"
>>
>> but this file does not exist. Possible reasons include:
>>
>> * The file was deleted, renamed, or moved to another location.
>>
>> * An install or uninstall procedure did not complete successfully.
>>
>> * The installation package was faulty and contained
>>
>>
>> "/usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets.cmake"
>>
>> but not all the files it references.
>
> The diff below is based on a patch from the FreeBSD port and should
> fix this issue. The only consumer is cad/kicad and it built fine.
>
> Kind regards,
> Johannes
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/cad/oce/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 28 Feb 2023 21:22:28 - 1.9
> +++ Makefile 31 Aug 2023 19:47:51 -
> @@ -7,7 +7,7 @@ GH_ACCOUNT = tpaviot
> GH_PROJECT = oce
> GH_COMMIT = 98a788062f0f30593880b0df1bcf967408212ba4
> DISTNAME = oce-7.6.0
> -REVISION = 1
> +REVISION = 2
>
> .for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
> TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR \
> Index: patches/patch-adm_cmake_occt_macros_cmake
> ===
> RCS file: /cvs/ports/cad/oce/patches/patch-adm_cmake_occt_macros_cmake,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-adm_cmake_occt_macros_cmake
> --- patches/patch-adm_cmake_occt_macros_cmake 11 Mar 2022 18:24:30 -
> 1.2
> +++ patches/patch-adm_cmake_occt_macros_cmake 31 Aug 2023 19:47:51 -
> @@ -1,15 +1,12 @@
> -Ugly hack on ALL_OCCT_TARGET_FILES: change later
> -
> Index: adm/cmake/occt_macros.cmake
> --- adm/cmake/occt_macros.cmake.orig
> +++ adm/cmake/occt_macros.cmake
> -@@ -592,7 +592,8 @@ macro (OCCT_UPDATE_TARGET_FILE)
> +@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
> "cmake_policy(PUSH)
> cmake_policy(SET CMP0007 NEW)
> string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\"
> CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
> - file (GLOB ALL_OCCT_TARGET_FILES
> \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
> -+ file (GLOB ALL_OCCT_TARGET_FILES
> -+
> \"${PROJECT_BINARY_DIR}/CMakeFiles/Export/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
> ++ file (GLOB ALL_OCCT_TARGET_FILES
> \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
> foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
> file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
> file (REMOVE \"\${TARGET_FILENAME}\")
[fix] cad/oce: unreplaced variable on cmake files
Hi,
The following cmake files installed by cad/oce contain a variable
(${OCCT_INSTALL_BIN_LETTER}) that should've been replaced during
installation:
/usr/local/lib/cmake/opencascade/OpenCASCADEApplicationFrameworkTargets-release.cmake
/usr/local/lib/cmake/opencascade/OpenCASCADEDataExchangeTargets-release.cmake
/usr/local/lib/cmake/opencascade/OpenCASCADEDrawTargets-release.cmake
/usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets-release.cmake
/usr/local/lib/cmake/opencascade/OpenCASCADEModelingAlgorithmsTargets-release.cmake
/usr/local/lib/cmake/opencascade/OpenCASCADEModelingDataTargets-release.cmake
/usr/local/lib/cmake/opencascade/OpenCASCADEVisualizationTargets-release.cmake
To verify, run the following. You'll notice how the variable is
escaped (\${...}):
# pkg_add oce
$ grep OCCT_INSTALL_BIN_LETTER /usr/local/lib/cmake/opencascade/OpenCASCADE*
I'm working on porting FreeCAD (which depends on oce)
and I'm getting the following error during the configuration stage:
> CMake Error at
> /usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets.cmake:87
> (message):
> The imported target "TKernel" references the file
>
> "/usr/local/lib${OCCT_INSTALL_BIN_LETTER}/libTKernel.so.1.0"
>
> but this file does not exist. Possible reasons include:
>
> * The file was deleted, renamed, or moved to another location.
>
> * An install or uninstall procedure did not complete successfully.
>
> * The installation package was faulty and contained
>
>
> "/usr/local/lib/cmake/opencascade/OpenCASCADEFoundationClassesTargets.cmake"
>
> but not all the files it references.
The diff below is based on a patch from the FreeBSD port and should
fix this issue. The only consumer is cad/kicad and it built fine.
Kind regards,
Johannes
Index: Makefile
===
RCS file: /cvs/ports/cad/oce/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile28 Feb 2023 21:22:28 - 1.9
+++ Makefile31 Aug 2023 19:47:51 -
@@ -7,7 +7,7 @@ GH_ACCOUNT =tpaviot
GH_PROJECT = oce
GH_COMMIT =98a788062f0f30593880b0df1bcf967408212ba4
DISTNAME = oce-7.6.0
-REVISION = 1
+REVISION = 2
.for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR \
Index: patches/patch-adm_cmake_occt_macros_cmake
===
RCS file: /cvs/ports/cad/oce/patches/patch-adm_cmake_occt_macros_cmake,v
retrieving revision 1.2
diff -u -p -r1.2 patch-adm_cmake_occt_macros_cmake
--- patches/patch-adm_cmake_occt_macros_cmake 11 Mar 2022 18:24:30 -
1.2
+++ patches/patch-adm_cmake_occt_macros_cmake 31 Aug 2023 19:47:51 -
@@ -1,15 +1,12 @@
-Ugly hack on ALL_OCCT_TARGET_FILES: change later
-
Index: adm/cmake/occt_macros.cmake
--- adm/cmake/occt_macros.cmake.orig
+++ adm/cmake/occt_macros.cmake
-@@ -592,7 +592,8 @@ macro (OCCT_UPDATE_TARGET_FILE)
+@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
"cmake_policy(PUSH)
cmake_policy(SET CMP0007 NEW)
string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\"
CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
- file (GLOB ALL_OCCT_TARGET_FILES
\"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
-+ file (GLOB ALL_OCCT_TARGET_FILES
-+
\"${PROJECT_BINARY_DIR}/CMakeFiles/Export/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
++ file (GLOB ALL_OCCT_TARGET_FILES
\"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
file (REMOVE \"\${TARGET_FILENAME}\")
Re: [Fix] cad/oce
I think that's good enough, ok
On 2023/02/28 10:02, Tracey Emery wrote:
> Ping.
>
> On Mon, Feb 13, 2023 at 02:00:24PM -0700, Tracey Emery wrote:
> > Hello ports,
> >
> > This should fix the build failures for oce on sparc64.
> >
> > ok?
> >
> > --
> >
> > Tracey Emery
> >
> > Index: Makefile
> > ===
> > RCS file: /home/cvs/ports/cad/oce/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- Makefile25 Jan 2023 18:44:36 - 1.8
> > +++ Makefile13 Feb 2023 20:58:51 -
> > @@ -7,7 +7,7 @@ GH_ACCOUNT =tpaviot
> > GH_PROJECT = oce
> > GH_COMMIT =98a788062f0f30593880b0df1bcf967408212ba4
> > DISTNAME = oce-7.6.0
> > -REVISION = 0
> > +REVISION = 1
> >
> > .for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF
> > TKCDF \
> > TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR \
> > @@ -50,7 +50,14 @@ BITS=64
> > .else
> > BITS=32
> > .endif
> > -SUBST_VARS += BITS
> > +
> > +.if ${PROPERTIES:Mclang}
> > +COMP=clang
> > +.else
> > +COMP=gcc
> > +.endif
> > +
> > +SUBST_VARS += BITS COMP
> >
> > # fix bash and make installed script names less generic
> > pre-configure:
> > Index: pkg/PLIST
> > ===
> > RCS file: /home/cvs/ports/cad/oce/pkg/PLIST,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 PLIST
> > --- pkg/PLIST 11 Mar 2022 18:24:30 - 1.4
> > +++ pkg/PLIST 13 Feb 2023 20:47:23 -
> > @@ -1,7 +1,7 @@
> > bin/DRAWEXE
> > @bin bin/DRAWEXE-7.6.0
> > bin/oce_custom.sh
> > -bin/oce_custom_clang_${BITS}.sh
> > +bin/oce_custom_${COMP}_${BITS}.sh
> > bin/oce_draw.sh
> > bin/oce_env.sh
> > include/opencascade/
> >
>
> --
>
> Tracey Emery
>
Re: [Fix] cad/oce
Ping.
On Mon, Feb 13, 2023 at 02:00:24PM -0700, Tracey Emery wrote:
> Hello ports,
>
> This should fix the build failures for oce on sparc64.
>
> ok?
>
> --
>
> Tracey Emery
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/cad/oce/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 25 Jan 2023 18:44:36 - 1.8
> +++ Makefile 13 Feb 2023 20:58:51 -
> @@ -7,7 +7,7 @@ GH_ACCOUNT = tpaviot
> GH_PROJECT = oce
> GH_COMMIT = 98a788062f0f30593880b0df1bcf967408212ba4
> DISTNAME = oce-7.6.0
> -REVISION = 0
> +REVISION = 1
>
> .for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
> TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR \
> @@ -50,7 +50,14 @@ BITS=64
> .else
> BITS=32
> .endif
> -SUBST_VARS += BITS
> +
> +.if ${PROPERTIES:Mclang}
> +COMP=clang
> +.else
> +COMP=gcc
> +.endif
> +
> +SUBST_VARS += BITS COMP
>
> # fix bash and make installed script names less generic
> pre-configure:
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/cad/oce/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 11 Mar 2022 18:24:30 - 1.4
> +++ pkg/PLIST 13 Feb 2023 20:47:23 -
> @@ -1,7 +1,7 @@
> bin/DRAWEXE
> @bin bin/DRAWEXE-7.6.0
> bin/oce_custom.sh
> -bin/oce_custom_clang_${BITS}.sh
> +bin/oce_custom_${COMP}_${BITS}.sh
> bin/oce_draw.sh
> bin/oce_env.sh
> include/opencascade/
>
--
Tracey Emery
[Fix] cad/oce
Hello ports,
This should fix the build failures for oce on sparc64.
ok?
--
Tracey Emery
Index: Makefile
===
RCS file: /home/cvs/ports/cad/oce/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile25 Jan 2023 18:44:36 - 1.8
+++ Makefile13 Feb 2023 20:58:51 -
@@ -7,7 +7,7 @@ GH_ACCOUNT =tpaviot
GH_PROJECT = oce
GH_COMMIT =98a788062f0f30593880b0df1bcf967408212ba4
DISTNAME = oce-7.6.0
-REVISION = 0
+REVISION = 1
.for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR \
@@ -50,7 +50,14 @@ BITS=64
.else
BITS=32
.endif
-SUBST_VARS += BITS
+
+.if ${PROPERTIES:Mclang}
+COMP=clang
+.else
+COMP=gcc
+.endif
+
+SUBST_VARS += BITS COMP
# fix bash and make installed script names less generic
pre-configure:
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/cad/oce/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 11 Mar 2022 18:24:30 - 1.4
+++ pkg/PLIST 13 Feb 2023 20:47:23 -
@@ -1,7 +1,7 @@
bin/DRAWEXE
@bin bin/DRAWEXE-7.6.0
bin/oce_custom.sh
-bin/oce_custom_clang_${BITS}.sh
+bin/oce_custom_${COMP}_${BITS}.sh
bin/oce_draw.sh
bin/oce_env.sh
include/opencascade/
