Skip to content

Use GNUInstallDirs for install paths #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from

Conversation

tripzero
Copy link

@tripzero tripzero commented Mar 10, 2019

libdir might have different name than "lib" (ie, lib32, lib64, etc). Use cmake GNU standards by default which operating systems know to change to match their configuration.

This patch also gives each so a version string.

@tripzero tripzero mentioned this pull request Mar 12, 2019
@paigeale
Copy link
Contributor

Thank you Kevron. I will port this change into our closed source system to go through the proper testing. I will provide feedback if anything goes wrong.

@tjaalton
Copy link

thanks for the patch, I gave it a try.. but I don't see it install libigdfcl anywhere, since it drops the line for fcl_dll

@paigeale
Copy link
Contributor

The patch was slightly modified to remove ".so" naming convention for we were working on another patch to handle that. Patch to handle GNUInstallDirs will go in tonight

@tjaalton
Copy link

ok, let me know what the .so patch will be and I'll try that

@tripzero
Copy link
Author

tripzero commented Mar 13, 2019

thanks for the patch, I gave it a try.. but I don't see it install libigdfcl anywhere, since it drops the line for fcl_dll

Looks like I screwed up the rebase. That would explain why I no longer see libigdfcl locally. @paigeale do you want me to submit without the so rename and with the fcl_dll fix?

@paigeale
Copy link
Contributor

.so rename is applied in 3cc1170 . GNUInstallDirs going in today

VPG-SWE-Github pushed a commit that referenced this pull request Mar 19, 2019
Change-Id: I7e194df02bfb86528539b22aa92846e228268fb4
@tripzero
Copy link
Author

Looks like 0770a37 covers most of this. closing

@tripzero tripzero closed this Mar 20, 2019
@tjaalton
Copy link

it got reverted though, so shouldn't this be reopened now?

@dvrogozh
Copy link
Contributor

I also think this one needs to be reopened, but I don't have right to do that. Resolving this issue we need to pay attention at #82 (comment).

@dvrogozh
Copy link
Contributor

Commit 48660a1 should fix this issue. @tripzero : can you, please, verify?

@tripzero
Copy link
Author

Commit 48660a1 should fix this issue. @tripzero : can you, please, verify?

%files dev %defattr(-,root,root,-) /usr/include/igc/cif/CMakeLists.txt /usr/include/igc/cif/cif/CMakeLists.txt /usr/include/igc/cif/cif/builtins/builtins_registry.h /usr/include/igc/cif/cif/builtins/memory/buffer/buffer.h /usr/include/igc/cif/cif/builtins/memory/buffer/impl/buffer_impl.h /usr/include/igc/cif/cif/common/cif.h /usr/include/igc/cif/cif/common/cif_main.h /usr/include/igc/cif/cif/common/coder.h /usr/include/igc/cif/cif/common/compatibility.h /usr/include/igc/cif/cif/common/id.h /usr/include/igc/cif/cif/common/library_api.h /usr/include/igc/cif/cif/common/library_handle.h /usr/include/igc/cif/cif/export/build/binary_version.h /usr/include/igc/cif/cif/export/cif_impl.h /usr/include/igc/cif/cif/export/cif_main_impl.h /usr/include/igc/cif/cif/export/interface_creator.h /usr/include/igc/cif/cif/export/library_api.h /usr/include/igc/cif/cif/export/muiltiversion.h /usr/include/igc/cif/cif/export/pimpl_base.h /usr/include/igc/cif/cif/export/registry.h /usr/include/igc/cif/cif/helpers/error.h /usr/include/igc/cif/cif/helpers/memory.h /usr/include/igc/cif/cif/import/cif_main.h /usr/include/igc/cif/cif/import/library_api.h /usr/include/igc/cif/cif/macros/disable.h /usr/include/igc/cif/cif/macros/enable.h /usr/include/igc/cif/cif/os/lin/lin_library_handle.h /usr/include/igc/cif/cif/os/win/win_library_handle.h /usr/include/igc/igc.opencl.h /usr/include/igc/ocl_igc_interface/code_type.h /usr/include/igc/ocl_igc_interface/fcl_ocl_device_ctx.h /usr/include/igc/ocl_igc_interface/fcl_ocl_translation_ctx.h /usr/include/igc/ocl_igc_interface/gt_system_info.h /usr/include/igc/ocl_igc_interface/igc_features_and_workarounds.h /usr/include/igc/ocl_igc_interface/igc_ocl_device_ctx.h /usr/include/igc/ocl_igc_interface/igc_ocl_translation_ctx.h /usr/include/igc/ocl_igc_interface/impl/fcl_ocl_device_ctx_impl.h /usr/include/igc/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.h /usr/include/igc/ocl_igc_interface/impl/gt_system_info_impl.h /usr/include/igc/ocl_igc_interface/impl/igc_features_and_workarounds_impl.h /usr/include/igc/ocl_igc_interface/impl/igc_ocl_device_ctx_impl.h /usr/include/igc/ocl_igc_interface/impl/igc_ocl_translation_ctx_impl.h /usr/include/igc/ocl_igc_interface/impl/ocl_gen_binary_impl.h /usr/include/igc/ocl_igc_interface/impl/ocl_translation_output_impl.h /usr/include/igc/ocl_igc_interface/impl/platform_impl.h /usr/include/igc/ocl_igc_interface/ocl_gen_binary.h /usr/include/igc/ocl_igc_interface/ocl_translation_output.h /usr/include/igc/ocl_igc_interface/platform.h /usr/include/igc/ocl_igc_interface/platform_helper.h /usr/include/igc/ocl_igc_shared/device_enqueue/DeviceEnqueueInternalTypes.h /usr/include/igc/ocl_igc_shared/device_enqueue/device_enqueue_internal_types.h /usr/include/igc/ocl_igc_shared/executable_format/patch_g10.h /usr/include/igc/ocl_igc_shared/executable_format/patch_g7.h /usr/include/igc/ocl_igc_shared/executable_format/patch_g8.h /usr/include/igc/ocl_igc_shared/executable_format/patch_g9.h /usr/include/igc/ocl_igc_shared/executable_format/patch_list.h /usr/include/igc/ocl_igc_shared/executable_format/patch_shared.h /usr/include/igc/ocl_igc_shared/executable_format/program_debug_data.h /usr/include/igc/ocl_igc_shared/gtpin/gtpin_driver_common.h /usr/include/igc/ocl_igc_shared/gtpin/gtpin_ocl_interface.h /usr/lib64/pkgconfig/igc-opencl.pc

double "cif" directory, but otherwise fine.

%files lib %defattr(-,root,root,-) /usr/lib/libopencl_clang.so /usr/lib64/libiga64.so /usr/lib64/libigc.so /usr/lib64/libigdfcl.so
the libopencl_clang.so symlink is still an issue #76

Otherwise, ship it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants