Skip to content
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

Add ck 0.5.2 #2737

Merged
merged 1 commit into from Jan 20, 2017
Merged

Add ck 0.5.2 #2737

merged 1 commit into from Jan 20, 2017

Conversation

@alarcher
Copy link
Contributor

alarcher commented Jan 19, 2017

  • Patched configure to allow 32-bit build on amd64.
  • Header should be split between MARCH32/MACH64 due to specific values, same as Circonus/OmniOS.
  • Tests do not work due to unsupported out-of-source build, do not throw error, checked manually 100% passed.

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME= ck

This comment has been minimized.

Copy link
@pyhalov

pyhalov Jan 19, 2017

Contributor

Please, fix formatting, it looks really ugly :)

This comment has been minimized.

Copy link
@alarcher

alarcher Jan 19, 2017

Author Contributor

I switched to tabs to conform with most Makefiles... shoud I use spaces instead?

This comment has been minimized.

Copy link
@pyhalov

pyhalov Jan 19, 2017

Contributor

I don't know, perhaps, wrong tab count, but usually it looks better on github

include $(WS_MAKE_RULES)/ips.mk

USRINCDIR.32=$(USRINCDIR)
USRINCDIR.64=$(USRINCDIR)/$(MACH64)

This comment has been minimized.

Copy link
@pyhalov

pyhalov Jan 19, 2017

Contributor

Don't do it... We don't ship /usr/include/$(MACH64).
Possible sollutions:

  • /usr/lib/ck/include, /usr/lib/$(MACH64)/include for platform-dependent headers (with corresponding pkgconfig patches);
  • deliver /usr/include/header-32/64.h and generate /usr/include/header.h , which includes necessary headers - like it's done in python (it would be good to have only one such header with platform-specific definitions);
  • patch headers as needed (perhaps, even post-configure, like openssl does).

This comment has been minimized.

Copy link
@alarcher

alarcher Jan 19, 2017

Author Contributor

FYI Circonus/OmniOS does like this and /usr/include/amd64 already exists for sys.
Which option do you prefer?

This comment has been minimized.

Copy link
@pyhalov

pyhalov Jan 19, 2017

Contributor

Does all headers really differ? If only several, we could extract these definitions in /usr/include/header-$(BITS).h. If all, perhaps it's not the best option.

This comment has been minimized.

Copy link
@alarcher

alarcher Jan 19, 2017

Author Contributor

Not much actually. I can piggy patch the offending header.

This comment has been minimized.

Copy link
@alarcher

alarcher Jan 19, 2017

Author Contributor

I just usually avoid messing with code that is not mine.

This comment has been minimized.

Copy link
@alarcher

alarcher Jan 19, 2017

Author Contributor

Added header with _LP64 ifdef.

This comment has been minimized.

Copy link
@pyhalov

pyhalov Jan 19, 2017

Contributor

seems better, don't forget to remove unnecessary definitions from Makefile

install: $(INSTALL_32_and_64)

# Tests are not supported out-of-source for now
test: $(TEST_32_and_64)

This comment has been minimized.

Copy link
@pyhalov

pyhalov Jan 19, 2017

Contributor

Will something like in postgresql work? I mean clone or copy source to build dir in pre-configure hook and use CONFIGURE_SCRIPT=$(@d)/configure.

file path=usr/lib/$(MACH64)/libck.so.$(COMPONENT_VERSION)
link path=usr/lib/$(MACH64)/libck.so.0 target=libck.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/pkgconfig/ck.pc
file path=usr/lib/libck.a

This comment has been minimized.

Copy link
@pyhalov

pyhalov Jan 19, 2017

Contributor

Do we need static libs?

file path=usr/lib/libck.so.$(COMPONENT_VERSION)
link path=usr/lib/libck.so.0 target=libck.so.$(COMPONENT_VERSION)
file path=usr/lib/pkgconfig/ck.pc
file path=usr/share/man/man3/CK_ARRAY_FOREACH.3.gz

This comment has been minimized.

Copy link
@pyhalov

pyhalov Jan 19, 2017

Contributor

Does illumos man understand compressed manuals? I thought it didn't.

This comment has been minimized.

Copy link
@alarcher

alarcher Jan 19, 2017

Author Contributor

Well I just get that the file is not in gzip format... :S

@alarcher alarcher force-pushed the alarcher:ck052 branch from fdff6c2 to b6f33a8 Jan 19, 2017
@pyhalov
Copy link
Contributor

pyhalov commented Jan 19, 2017

It would be good to ship uncompressed man pages

@alarcher alarcher force-pushed the alarcher:ck052 branch from b6f33a8 to 6ef2536 Jan 20, 2017
@alarcher alarcher force-pushed the alarcher:ck052 branch from 6ef2536 to 0f4b111 Jan 20, 2017
@pyhalov pyhalov merged commit fb02baf into OpenIndiana:oi/hipster Jan 20, 2017
@alarcher alarcher deleted the alarcher:ck052 branch May 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.